Skip to content

Commit 627125c

Browse files
committed
⬆️ Ember-Cli 2.18...3.0
1 parent 3ff266f commit 627125c

File tree

12 files changed

+611
-577
lines changed

12 files changed

+611
-577
lines changed

.eslintrc.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ module.exports = {
1414
// node files
1515
{
1616
files: [
17+
"ember-cli-build.js",
1718
"index.js",
1819
"testem.js",
19-
"ember-cli-build.js",
2020
"config/**/*.js",
2121
"tests/dummy/config/**/*.js",
2222
],
23+
excludedFiles: [
24+
"addon/**",
25+
"addon-test-support/**",
26+
"app/**",
27+
"tests/dummy/app/**",
28+
],
2329
excludedFiles: ["app/**", "addon/**", "tests/dummy/app/**"],
2430
parserOptions: {
2531
sourceType: "script",
@@ -38,14 +44,5 @@ module.exports = {
3844
}
3945
),
4046
},
41-
42-
// test files
43-
{
44-
files: ["tests/**/*.js"],
45-
excludedFiles: ["tests/dummy/**/*.js"],
46-
env: {
47-
embertest: true,
48-
},
49-
},
5047
],
5148
};

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
# as well as latest stable release (bonus points to beta/canary)
2525
- EMBER_TRY_SCENARIO=ember-lts-2.12
2626
- EMBER_TRY_SCENARIO=ember-lts-2.16
27+
- EMBER_TRY_SCENARIO=ember-lts-2.18
2728
- EMBER_TRY_SCENARIO=ember-release
2829
- EMBER_TRY_SCENARIO=ember-beta
2930
- EMBER_TRY_SCENARIO=ember-canary

0 commit comments

Comments
 (0)