⬆️ Ember-Cli 2.16...2.17

cybertoothca · Apr 6, 2022 · e9e36cd · e9e36cd
1 parent 493f868
commit e9e36cd
Show file tree

Hide file tree

Showing 10 changed files with 226 additions and 251 deletions.
diff --git a/.npmignore b/.npmignore
@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.travis.yml b/.travis.yml
@@ -22,8 +22,8 @@ env:
   matrix:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - EMBER_TRY_SCENARIO=ember-lts-2.8
     - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,98 +2,74 @@
 module.exports = {
   scenarios: [
     {
-      name: 'ember-lts-2.4',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-4'
-        },
-        resolutions: {
-          'ember': 'lts-2-4'
-        }
-      },
+      name: "ember-lts-2.12",
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
-    },
-    {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
+          "ember-source": "~2.12.0",
         },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
       },
-      npm: {
-        devDependencies: {
-          'ember-source': null
-        }
-      }
     },
     {
-      name: 'ember-lts-2.12',
+      name: "ember-lts-2.16",
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0'
-        }
-      }
+          "ember-source": "~2.16.0",
+        },
+      },
     },
     {
-      name: 'ember-release',
+      name: "ember-release",
       bower: {
         dependencies: {
-          'ember': 'components/ember#release'
+          ember: "components/ember#release",
         },
         resolutions: {
-          'ember': 'release'
-        }
+          ember: "release",
+        },
       },
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
+          "ember-source": null,
+        },
+      },
     },
     {
-      name: 'ember-beta',
+      name: "ember-beta",
       bower: {
         dependencies: {
-          'ember': 'components/ember#beta'
+          ember: "components/ember#beta",
         },
         resolutions: {
-          'ember': 'beta'
-        }
+          ember: "beta",
+        },
       },
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
+          "ember-source": null,
+        },
+      },
     },
     {
-      name: 'ember-canary',
+      name: "ember-canary",
       bower: {
         dependencies: {
-          'ember': 'components/ember#canary'
+          ember: "components/ember#canary",
         },
         resolutions: {
-          'ember': 'canary'
-        }
+          ember: "canary",
+        },
       },
       npm: {
         devDependencies: {
-          'ember-source': null
-        }
-      }
+          "ember-source": null,
+        },
+      },
     },
     {
-      name: 'ember-default',
+      name: "ember-default",
       npm: {
-        devDependencies: {}
-      }
-    }
-  ]
+        devDependencies: {},
+      },
+    },
+  ],
 };
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   },
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "start": "ember serve",
     "test": "ember try:each"
   },
   "dependencies": {
@@ -48,28 +48,28 @@
     "bootswatch": "^3.3.7",
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.16.2",
+    "ember-cli": "~2.17.2",
     "ember-cli-bootstrap3-sass": "^1.0.6",
     "ember-cli-dependency-checker": "^2.0.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^1.1.1",
     "ember-cli-deploy-gzip": "^1.0.1",
     "ember-cli-deploy-s3": "^1.1.0",
-    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-font-awesome-sass": "^1.0.4",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-sass": "^7.1.1",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
     "ember-cli-update": "^0.40",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.16.0",
+    "ember-source": "~2.17.0",
     "ember-welcome-page": "^3.0.0",
     "loader.js": "^4.2.3"
   },

diff --git a/testem.js b/testem.js
@@ -9,7 +9,7 @@ module.exports = {
       args: [
         "--disable-gpu",
         "--headless",
-        "--remote-debugging-port=9222",
+        "--remote-debugging-port=0",
         "--window-size=1440,900",
       ],
     },

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -139,6 +139,7 @@ module.exports = function (environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = "#ember-testing";
+    ENV.APP.autoboot = false;
   }
 
   if (environment === "production") {

diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,6 +5,7 @@ import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
   let attributes = merge({}, config.APP);
+  attributes.autoboot = true;
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
   return run(() => {

diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,6 +1,10 @@
-import resolver from './helpers/resolver';
-import { setResolver } from 'ember-qunit';
-import { start } from 'ember-cli-qunit';
+import { start } from "ember-qunit";
+
+import { setApplication } from "@ember/test-helpers";
+
+import Application from "../app";
+import config from "../config/environment";
+
+setApplication(Application.create(config.APP));
 
-setResolver(resolver);
 start();