Remove backwards compat shims.

Preparing for for [email protected].

blueprints/ember-cli-qunit/index.js

@@ -1,5 +1,3 @@
-var RSVP = require('rsvp');
-
 module.exports = {
   normalizeEntityName: function() {
     // this prevents an error when the entityName is

index.js

@@ -32,10 +32,10 @@ module.exports = {
     var checker = new VersionChecker(this);
     var dep = checker.for('ember-cli', 'npm');
 
-    this._shouldImportEmberQUnit = !dep.gt('2.2.0-alpha');
-    // fixed in https://github.com/ember-cli/ember-cli/pull/5274
-    // this can be removed when we no longer support 2.2.0-beta.{1,2}
-    this._shouldImportQUnit = !dep.gt('2.2.0-beta.2');
+    if (!dep.gt('2.2.0-beta.2')) {
+      var SilentError = require('silent-error');
+      throw new SilentError('[email protected] and higher requires at least ember-cli@2.2.0. Please downgrade to ember-cli-qunit@2 for older ember-cli version support.');
+    }
 
     this.setTestGenerator();
   },
@@ -55,34 +55,10 @@ module.exports = {
 
     var trees = [
       tree,
-      this._notificationsTree()
+      this._notificationsTree(),
+      this.treeGenerator(qunitPath)
     ];
 
-    if (!this._shouldImportQUnit) {
-      trees.push(this.treeGenerator(qunitPath));
-    }
-
-    if (this._shouldImportEmberQUnit) {
-      // support for Ember CLI < 2.2.0-beta.1
-      var depTree = new MergeTrees(this._getDependencyTrees());
-
-      var BabelTranspiler = require('broccoli-babel-transpiler');
-      var transpiled = new BabelTranspiler(depTree, {
-        loose: true,
-        moduleIds: true,
-        modules: 'amdStrict'
-      });
-
-      var Concat = require('broccoli-concat');
-      var concattedTree = new Concat(transpiled, {
-        inputFiles: ['**/*.js'],
-        outputFile: '/ember-qunit/ember-qunit.js',
-        annotation: 'Concat: Ember QUnit'
-      });
-
-      trees.push(concattedTree);
-    }
-
     return new MergeTrees(trees, {
       annotation: 'ember-cli-qunit: treeForVendor'
     });
@@ -99,26 +75,13 @@ module.exports = {
     testSupportPath = path.dirname(testSupportPath) || 'assets';
 
     if (app.tests) {
-      var fileAssets;
-
-      if (this._shouldImportQUnit) {
-        // ember-cli < 2.2.0-beta.3 gets this from bower
-        fileAssets = [
-          target.bowerDirectory + '/qunit/qunit/qunit.js',
-          target.bowerDirectory + '/qunit/qunit/qunit.css'
-        ];
-      } else {
-        fileAssets = [
-          'vendor/qunit/qunit.js',
-          'vendor/qunit/qunit.css'
-        ];
-      }
-
-      fileAssets.push(
+      var fileAssets = [
+        'vendor/qunit/qunit.js',
+        'vendor/qunit/qunit.css',
         'vendor/qunit-notifications/index.js',
         'vendor/ember-cli-qunit/qunit-configuration.js',
         'vendor/ember-cli-qunit/test-loader.js'
-      );
+      ];
 
       var addonOptions = target.options['ember-cli-qunit'];
       // Skip if disableContainerStyles === false.
@@ -144,13 +107,6 @@ module.exports = {
         });
       });
     }
-
-    this.jshintrc = app.options.jshintrc;
-
-    if (this._shouldImportEmberQUnit) {
-      // support for Ember CLI < 2.2.0-beta.1
-      app.import('vendor/ember-qunit/ember-qunit.js', { type: 'test' });
-    }
   },
 
   _notificationsTree: function() {

package.json

@@ -27,7 +27,6 @@
   "homepage": "https://github.com/ember-cli/ember-cli-qunit",
   "dependencies": {
     "broccoli-babel-transpiler": "^5.5.0",
-    "broccoli-concat": "^2.2.0",
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.1.0",
     "ember-cli-babel": "^5.1.5",
@@ -36,7 +35,7 @@
     "qunit-notifications": "^0.1.1",
     "qunitjs": "^2.0.1",
     "resolve": "^1.1.6",
-    "rsvp": "^3.2.1"
+    "silent-error": "^1.0.0"
   },
   "devDependencies": {
     "ember-cli": "^2.4.2",