Repository: ember-cli/ember-cli
Pull request #7437 (2017-11-11 19:58:52)

Update to ember-cli-qunit@4.1.1.
* Replace beta version with stable release.
* Remove unused `tests/helpers/resolver.js`
* Import and use `setApplication` directly from `@ember/test-helpers`


Patch:
diff --git a/blueprints/addon/files/.travis.yml b/blueprints/addon/files/.travis.yml
index 6971fe52f..4c24b6b71 100644
--- a/blueprints/addon/files/.travis.yml
+++ b/blueprints/addon/files/.travis.yml
@@ -25,8 +25,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/blueprints/addon/files/addon-config/ember-try.js b/blueprints/addon/files/addon-config/ember-try.js
index 3eea72b9a..21f607970 100644
--- a/blueprints/addon/files/addon-config/ember-try.js
+++ b/blueprints/addon/files/addon-config/ember-try.js
@@ -2,18 +2,26 @@
 module.exports = {
   scenarios: [
     {
-      name: 'ember-lts-2.12',
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
+      },
       npm: {
         devDependencies: {
-          'ember-source': '~2.12.0'
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-lts-2.16',
+      name: 'ember-lts-2.12',
       npm: {
         devDependencies: {
-          'ember-source': '~2.16.0'
+          'ember-source': '~2.12.0'
         }
       }
     },
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index 8110b4884..37564ef61 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -26,7 +26,7 @@
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.1.0-beta.2",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",


Test patch:
diff --git a/blueprints/app/files/tests/helpers/resolver.js b/blueprints/app/files/tests/helpers/resolver.js
deleted file mode 100644
index b208d38d0..000000000
--- a/blueprints/app/files/tests/helpers/resolver.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Resolver from '../../resolver';
-import config from '../../config/environment';
-
-const resolver = Resolver.create();
-
-resolver.namespace = {
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix
-};
-
-export default resolver;
diff --git a/blueprints/app/files/tests/test-helper.js b/blueprints/app/files/tests/test-helper.js
index f219659e5..edc8122d5 100644
--- a/blueprints/app/files/tests/test-helper.js
+++ b/blueprints/app/files/tests/test-helper.js
@@ -1,8 +1,7 @@
-import resolver from './helpers/resolver';
-import {
-  setResolver
-} from 'ember-qunit';
-import { start } from 'ember-cli-qunit';
+import Application from '../app';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create({ autoboot: false }));
 
-setResolver(resolver);
 start();
diff --git a/tests/acceptance/smoke-test-slow.js b/tests/acceptance/smoke-test-slow.js
index 6528c2b8f..9051dfa28 100644
--- a/tests/acceptance/smoke-test-slow.js
+++ b/tests/acceptance/smoke-test-slow.js
@@ -152,7 +152,7 @@ describe('Acceptance: smoke-test', function() {
     output = output.join(EOL);
 
     expect(output).to.match(/fail\s+0/, 'no failures');
-    expect(output).to.match(/pass\s+12/, '12 passing');
+    expect(output).to.match(/pass\s+11/, '11 passing');
   }));
 
   it('ember new foo, build development, and verify generated files', co.wrap(function *() {
diff --git a/tests/fixtures/addon/npm/.travis.yml b/tests/fixtures/addon/npm/.travis.yml
index 38b4be764..ac366b8b3 100644
--- a/tests/fixtures/addon/npm/.travis.yml
+++ b/tests/fixtures/addon/npm/.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/tests/fixtures/addon/yarn/.travis.yml b/tests/fixtures/addon/yarn/.travis.yml
index 9f30c1837..defff0fc4 100644
--- a/tests/fixtures/addon/yarn/.travis.yml
+++ b/tests/fixtures/addon/yarn/.travis.yml
@@ -21,8 +21,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/tests/fixtures/app-import/package.json b/tests/fixtures/app-import/package.json
index 75c44576d..bcedd40ad 100644
--- a/tests/fixtures/app-import/package.json
+++ b/tests/fixtures/app-import/package.json
@@ -25,7 +25,7 @@
     "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-htmlbars-inline-precompile": "^0.4.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-qunit": "^4.1.1",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
diff --git a/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js b/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
index 497f19806..044268f9f 100644
--- a/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
+++ b/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
@@ -3,6 +3,7 @@ module.exports = function() {
     modulePrefix: 'some-cool-app',
     fileUsed: 'config/something-else.js',
     baseURL: '/',
-    locationType: 'auto'
+    locationType: 'auto',
+    APP: { }
   };
 };