Skip to content

Commit

Permalink
lint autofix some files
Browse files Browse the repository at this point in the history
  • Loading branch information
runspired committed Mar 30, 2019
1 parent bb64227 commit 7122192
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 114 deletions.
71 changes: 35 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
sudo: false
dist: trusty
node_js:
- "10"
- '10'

addons:
chrome: stable
Expand Down Expand Up @@ -37,88 +37,87 @@ jobs:
include:
# runs tests with current locked deps and linting
- stage: test
name: "Linting"
name: 'Linting'
if: NOT (branch ~= /^(release|lts).*/)
script:
- yarn lint:features
- yarn lint:js
- name: "Basic Tests"
- name: 'Basic Tests'
script: yarn test

- stage: additional tests
name: "Optional Features"
name: 'Optional Features'
if: NOT (branch ~= /^(release|lts).*/)
install: yarn install
script: yarn test:optional-features

- name: "Floating Dependencies"
- name: 'Floating Dependencies'
install: yarn install --no-lockfile --non-interactive
script: yarn test

- name: "Production"
- name: 'Production'
install: yarn install
script: yarn test:production

- name: "Max Transpilation"
- name: 'Max Transpilation'
install: yarn install
env: TARGET_IE11=true
script: yarn test

- name: "Node Tests"
- name: 'Node Tests'
install: yarn install
script: yarn test:node

# runs tests against each supported Ember version
- stage: ember version tests
name: "Ember LTS 2.18"
name: 'Ember LTS 2.18'
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- name: "Ember LTS 3.4"
- name: 'Ember LTS 3.4'
env: EMBER_TRY_SCENARIO=ember-lts-3.4
- name: "Ember Release"
- name: 'Ember Release'
if: NOT (branch ~= /^(release|lts).*/)
env: EMBER_TRY_SCENARIO=ember-release
- name: "Ember Beta"
- name: 'Ember Beta'
if: NOT (branch ~= /^(release|lts).*/)
env: EMBER_TRY_SCENARIO=ember-beta
- name: "Ember Canary"
- name: 'Ember Canary'
if: NOT (branch ~= /^(release|lts).*/)
env: EMBER_TRY_SCENARIO=ember-canary

# runs tests against various open-source projects for early-warning regression analysis
# We typically have 4 concurrent jobs, these jobs below are ordered to optimize total completion time
# By running longer jobs first, we allow the shorter jobs to complete within the same time block in parallel
- stage: external partner tests
name: "Ilios Frontend" # ~30min job
name: 'Ilios Frontend' # ~30min job
script: yarn test-external:ilios-frontend
- name: "Travis Web" # ~10min job
- name: 'Travis Web' # ~10min job
script: yarn test-external:travis-web
- name: "Ember Data Storefront" # ~5min job
- name: 'Ember Data Storefront' # ~5min job
script: yarn test-external:storefront
- name: "Ember Data Factory Guy" # ~5min job
- name: 'Ember Data Factory Guy' # ~5min job
script: yarn test-external:factory-guy
- name: "Ember Observer" # ~5min job
- name: 'Ember Observer' # ~5min job
script: yarn test-external:ember-observer
- name: "Ember Resource Metadata" # ~4.25min job
- name: 'Ember Resource Metadata' # ~4.25min job
script: yarn test-external:ember-resource-metadata
- name: "Ember Data Relationship Tracker" # ~4.25min job
- name: 'Ember Data Relationship Tracker' # ~4.25min job
script: yarn test-external:ember-data-relationship-tracker
- name: "Ember Data Model Fragments" # ~3.5min job
- name: 'Ember Data Model Fragments' # ~3.5min job
script: yarn test-external:model-fragments
- name: "emberaddons.com" # ~3.5min job
- name: 'emberaddons.com' # ~3.5min job
script: yarn test-external:emberaddons.com
- name: "Ember Data Change Tracker" # ~3.5min job
- name: 'Ember Data Change Tracker' # ~3.5min job
script: yarn test-external:ember-data-change-tracker
- name: "ember-m3" # ~3.5min job
- name: 'ember-m3' # ~3.5min job
script: yarn test-external:ember-m3

- stage: deploy
name: "Publish"
name: 'Publish'
install: yarn install
script:
- node_modules/.bin/ember try:reset
- yarn build:production


before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
Expand All @@ -131,18 +130,18 @@ script:

env:
global:
- BROCCOLI_ENV="production"
- S3_BUILD_CACHE_BUCKET=emberjs-build-cache
- S3_BUCKET_NAME=builds.emberjs.com
- secure: ! 'S+DIdzEPvqQenk1cFq5UjbkoEKDY4j3E/g+Wlz798xxyTkrKQZxoazLXng8I
- BROCCOLI_ENV="production"
- S3_BUILD_CACHE_BUCKET=emberjs-build-cache
- S3_BUCKET_NAME=builds.emberjs.com
- secure: ! 'S+DIdzEPvqQenk1cFq5UjbkoEKDY4j3E/g+Wlz798xxyTkrKQZxoazLXng8I
gsxElZtB2kpyUq81gWgZcuygO53mcBuCa4rPIsh0Di6Ik+HDELSFVZ4EN4NK
gsxElZtB2kpyUq81gWgZcuygO53mcBuCa4rPIsh0Di6Ik+HDELSFVZ4EN4NK
z9yP6D7pMY+RnlSvErf3OXSzrxkDcXDxCU4ljBJl1rNBbtAOu5E='
- secure: ! 'YjnT2cF8K0M2fSkab+PY3j8XzumBrjzeGsAN4jtyw4shqnywFaE68qO1IIjY
z9yP6D7pMY+RnlSvErf3OXSzrxkDcXDxCU4ljBJl1rNBbtAOu5E='
- secure: ! 'YjnT2cF8K0M2fSkab+PY3j8XzumBrjzeGsAN4jtyw4shqnywFaE68qO1IIjY
UvaE/CbWMxO/6FszR02gJHaF+YyfU5WAS0ahFFLHuC1twMtQPxi+nScjKZEs
UvaE/CbWMxO/6FszR02gJHaF+YyfU5WAS0ahFFLHuC1twMtQPxi+nScjKZEs
kLwKiKgRNhindV3WvbUcoiIrmrgBMCiBRRd4eyVBlhbZ8RTo1Ig='
kLwKiKgRNhindV3WvbUcoiIrmrgBMCiBRRd4eyVBlhbZ8RTo1Ig='

- secure: "hJZXijsot2wMiMsxbDImH+nB5v77a7O7lQ7bicOQEQxmnTtXSvqfa4X4vQ/d4o7NNYYYHUuOpyILgRV+arqI6UOi7XEVGka/7M5q58R5exS6bk0cY0jnpUhUVW/8mpKEUgcVeE6mIDWaR090l3uaT2JhU/WSLkzbj45e38HaF/4="
- secure: 'hJZXijsot2wMiMsxbDImH+nB5v77a7O7lQ7bicOQEQxmnTtXSvqfa4X4vQ/d4o7NNYYYHUuOpyILgRV+arqI6UOi7XEVGka/7M5q58R5exS6bk0cY0jnpUhUVW/8mpKEUgcVeE6mIDWaR090l3uaT2JhU/WSLkzbj45e38HaF/4='
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Code Of Conduct

The `ember-data` core team and and the broader `Ember` community are committed to everyone
having a safe and inclusive experience.
having a safe and inclusive experience.

- Our **Community Guidelines / Code of Conduct** can be found at [emberjs.com/guidelines](https://emberjs.com/guidelines/)
- A history of updates to this page is located at [https://github.com/emberjs/website/commits/master/source/guidelines.html.erb](https://github.com/emberjs/website/commits/master/source/guidelines.html.erb)
40 changes: 20 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ are narrowly scoped with clear understanding of alternatives, drawbacks, and the
4. Attend the weekly team meeting to discuss your idea
5. Open an [RFC issue](https://github.com/emberjs/rfcs/issues?q=is%3Aissue+is%3Aopen+label%3AT-ember-data)
to broaden and record the discussion if the idea needs more time for discussion and iteration.
* label your issue with `T-ember-data` (or ask someone in `#dev-ember-data` to add the label if you lack the permission)
* announce your issue in `#dev-ember-data` and anywhere else desired such as `#news-and-announcements` and `twitter`.
- label your issue with `T-ember-data` (or ask someone in `#dev-ember-data` to add the label if you lack the permission)
- announce your issue in `#dev-ember-data` and anywhere else desired such as `#news-and-announcements` and `twitter`.
6. [Draft an RFC](https://github.com/emberjs/rfcs#what-the-process-is) and share it with those you have
been discussing the ideas with.
7. Publish your RFC by opening a PR to [emberjs/rfcs/](https://github.com/emberjs/rfcs/pulls?q=is%3Apr+is%3Aopen+label%3AT-ember-data)
* label your PR with `T-ember-data` (or ask someone in `#dev-ember-data` to add the label if you lack the permission)
* announce your PR in `#dev-ember-data` and anywhere else desired such as `#news-and-announcements` and `twitter`.
- label your PR with `T-ember-data` (or ask someone in `#dev-ember-data` to add the label if you lack the permission)
- announce your PR in `#dev-ember-data` and anywhere else desired such as `#news-and-announcements` and `twitter`.
8. Attend weekly team meetings to discuss the RFC, continue iterating on the RFC, and help shepherd it to completion.
9. Build a proof-of-concept. Sometimes this is best if it occurs alongside drafting the RFC, as it often informs
the RFC design, known drawbacks, and alternatives. Often it will become incorporated in the final implementation.
Expand All @@ -69,38 +69,38 @@ Before implementing a feature or a fix, it is usually best to discuss the propos
existing public APIs. If this is the case, it is even more important to discuss the issue's problem
space and the proposed changes before diving too deep into the implementation.

* Submissions should be made as PRs against the `master` branch.
- Submissions should be made as PRs against the `master` branch.

#### Writing Tests

All PRs should have accompanying tests. For bug-fixes, this should include tests that demonstrate
the issue being fixed and test that the solution works.
the issue being fixed and test that the solution works.

* We do write tests for our warns and assertion messages, using the `assert.expectAssertion()` and `assert.expectWarning()` helpers.
* Because Travis runs tests in the `production` environment, assertions and warnings are stripped out. To avoid tests on
- We do write tests for our warns and assertion messages, using the `assert.expectAssertion()` and `assert.expectWarning()` helpers.
- Because Travis runs tests in the `production` environment, assertions and warnings are stripped out. To avoid tests on
warning/assertion messages failing for your PR, use the `testInDebug` function instead of `qunit` `test` to skip them in production.
* Include tests that fail without your code, and pass with it
* Update the documentation, examples, and guides when affected by your contribution
- Include tests that fail without your code, and pass with it
- Update the documentation, examples, and guides when affected by your contribution

#### Running Tests

* PRs will automatically run an extensive set of test scenarios for your work
* `ember-data` is an `ember-addon` and uses `ember-cli`. To run tests locally
- PRs will automatically run an extensive set of test scenarios for your work
- `ember-data` is an `ember-addon` and uses `ember-cli`. To run tests locally
use `ember test` or `ember test --serve`. For additional test commands see the list
of commands in [./package.json](./package.json)

#### Commit Tagging

All commits should be tagged. Tags are denoted by square brackets (`[]`) and come at the start of the commit message.

* `[CLEANUP]`: commits that remove deprecated functionality
* `[CHORE]`: commits that refactor code or update dependencies
* `[TEST <feature-name>]`: commits that add tests for a feature
* `[FEAT <feature-name>]`: commits that add features
* `[DOC <feature-name>]` | `[DOC]`: commits that add or fix documentation for a feature
* `[SECURITY <cve>]`: commits that address security vulnerabilities. Please do not submit security related PRs without
- `[CLEANUP]`: commits that remove deprecated functionality
- `[CHORE]`: commits that refactor code or update dependencies
- `[TEST <feature-name>]`: commits that add tests for a feature
- `[FEAT <feature-name>]`: commits that add features
- `[DOC <feature-name>]` | `[DOC]`: commits that add or fix documentation for a feature
- `[SECURITY <cve>]`: commits that address security vulnerabilities. Please do not submit security related PRs without
coordinating with the security team. See the [Security Policy](https://emberjs.com/security/) for more information.
* `[BUGFIX <feature-name>]`: commits that fix an issue. The PR should also specify the github issue # of the
- `[BUGFIX <feature-name>]`: commits that fix an issue. The PR should also specify the github issue # of the
issue being resolved.

In general almost all commits should fall into one of the above categories. In the cases where they don't please submit
Expand Down Expand Up @@ -189,4 +189,4 @@ for analysis. To run scenarios:

## Notes

* Commit tagging section taken from [ember.js](https://github.com/emberjs/ember.js/blob/5641c3089180bdd1d4fa54e9dd2d3ac285f088e4/CONTRIBUTING.md#commit-tagging)
- Commit tagging section taken from [ember.js](https://github.com/emberjs/ember.js/blob/5641c3089180bdd1d4fa54e9dd2d3ac285f088e4/CONTRIBUTING.md#commit-tagging)
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Test against these versions of Node.js.
environment:
matrix:
- nodejs_version: "6"
- nodejs_version: '6'

cache:
- '%LOCALAPPDATA%\Yarn'
Expand All @@ -27,4 +27,4 @@ test_script:
build: off

# Set build version format here instead of in the admin panel.
version: "{build}"
version: '{build}'
Loading

0 comments on commit 7122192

Please sign in to comment.