Merge pull request #215 from rwjblue/test-without-jquery

Reduce direct jQuery usage in tests.

.travis.yml

@@ -24,6 +24,7 @@ env:
   - EMBER_TRY_SCENARIO=ember-lts-2.12
   - EMBER_TRY_SCENARIO=ember-lts-2.16
   - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-release-with-jquery
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
   - EMBER_TRY_SCENARIO=ember-default

config/ember-try.js

@@ -12,6 +12,8 @@ module.exports = {
       npm: {
         devDependencies: {
           'ember-source': null,
+          'ember-native-dom-event-dispatcher': null,
+          'ember-fetch': null,
         },
       },
     },
@@ -28,6 +30,8 @@ module.exports = {
       npm: {
         devDependencies: {
           'ember-source': null,
+          'ember-native-dom-event-dispatcher': null,
+          'ember-fetch': null,
         },
       },
     },
@@ -44,6 +48,8 @@ module.exports = {
       npm: {
         devDependencies: {
           'ember-source': null,
+          'ember-native-dom-event-dispatcher': null,
+          'ember-fetch': null,
         },
       },
     },
@@ -52,6 +58,8 @@ module.exports = {
       npm: {
         devDependencies: {
           'ember-source': '~2.12.0',
+          'ember-native-dom-event-dispatcher': null,
+          'ember-fetch': null,
         },
       },
     },
@@ -111,6 +119,15 @@ module.exports = {
         },
       },
     },
+    {
+      name: 'ember-release-with-jquery',
+      npm: {
+        devDependencies: {
+          'ember-native-dom-event-dispatcher': null,
+          'ember-fetch': null,
+        },
+      },
+    },
     {
       name: 'ember-default',
       npm: {

ember-cli-build.js

@@ -4,11 +4,17 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  let app = new EmberAddon(defaults, {
+  let options = {
     eslint: {
       testGenerator: 'qunit',
     },
-  });
+  };
+
+  if (defaults.project.findAddonByName('ember-native-dom-event-dispatcher')) {
+    options.vendorFiles = { 'jquery.js': null };
+  }
+
+  let app = new EmberAddon(defaults, options);
 
   /*
     This build file specifies the options for the dummy test app of this

package.json

@@ -49,7 +49,9 @@
     "ember-debug-handlers-polyfill": "^1.0.3",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
+    "ember-fetch": "^3.4.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-native-dom-event-dispatcher": "^0.6.3",
     "ember-resolver": "^4.0.0",
     "ember-source": "~2.15.0",
     "ember-welcome-page": "^3.0.0",