Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce direct jQuery usage in tests. #215

Merged
merged 13 commits into from
Oct 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 17 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module.exports = {
npm: {
devDependencies: {
'ember-source': null,
'ember-native-dom-event-dispatcher': null,
'ember-fetch': null,
},
},
},
Expand All @@ -28,6 +30,8 @@ module.exports = {
npm: {
devDependencies: {
'ember-source': null,
'ember-native-dom-event-dispatcher': null,
'ember-fetch': null,
},
},
},
Expand All @@ -44,6 +48,8 @@ module.exports = {
npm: {
devDependencies: {
'ember-source': null,
'ember-native-dom-event-dispatcher': null,
'ember-fetch': null,
},
},
},
Expand All @@ -52,6 +58,8 @@ module.exports = {
npm: {
devDependencies: {
'ember-source': '~2.12.0',
'ember-native-dom-event-dispatcher': null,
'ember-fetch': null,
},
},
},
Expand Down Expand Up @@ -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: {
Expand Down
10 changes: 8 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
205 changes: 205 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 0 additions & 5 deletions tests/dummy/app/templates/application.hbs

This file was deleted.

Loading