Skip to content

Commit f71bbd0

Browse files
committed
Run tests without jQuery (package by package).
Adds support for running tests per-package without jQuery so that jQuery requirements do not creep into the rest of the framework.
1 parent ef04a33 commit f71bbd0

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

bin/run-tests.js

+6
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,15 @@ function generateEachPackageTests() {
184184
testFunctions.push(function() {
185185
return run('package=' + packageName);
186186
});
187+
if (packages[packageName].requiresJQuery === false) {
188+
testFunctions.push(function() {
189+
return run('package=' + packageName + '&jquery=none');
190+
});
191+
}
187192
testFunctions.push(function() {
188193
return run('package=' + packageName + '&enableoptionalfeatures=true');
189194
});
195+
190196
});
191197
}
192198

lib/packages.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module.exports = function() {
22
var packages = {
3-
'container': { trees: null, requirements: ['ember-utils'], isTypeScript: true, vendorRequirements: ['@glimmer/di'] },
4-
'ember-environment': { trees: null, requirements: [], skipTests: true },
5-
'ember-utils': { trees: null, requirements: [] },
6-
'ember-console': { trees: null, requirements: [], skipTests: true },
7-
'ember-metal': { trees: null, requirements: ['ember-environment', 'ember-utils'], vendorRequirements: ['backburner'] },
8-
'ember-debug': { trees: null, requirements: [] },
9-
'ember-runtime': { trees: null, vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal'] },
3+
'container': { trees: null, requirements: ['ember-utils'], isTypeScript: true, vendorRequirements: ['@glimmer/di'], requiresJQuery: false },
4+
'ember-environment': { trees: null, requirements: [], skipTests: true, requiresJQuery: false },
5+
'ember-utils': { trees: null, requirements: [], requiresJQuery: false },
6+
'ember-console': { trees: null, requirements: [], skipTests: true, requiresJQuery: false },
7+
'ember-metal': { trees: null, requirements: ['ember-environment', 'ember-utils'], vendorRequirements: ['backburner'], requiresJQuery: false },
8+
'ember-debug': { trees: null, requirements: [], requiresJQuery: false },
9+
'ember-runtime': { trees: null, vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal'], requiresJQuery: false },
1010
'ember-views': { trees: null, requirements: ['ember-runtime'], skipTests: true },
11-
'ember-extension-support': { trees: null, requirements: ['ember-application'] },
11+
'ember-extension-support': { trees: null, requirements: ['ember-application'], requiresJQuery: false },
1212
'ember-testing': { trees: null, requirements: ['ember-application', 'ember-routing'], testing: true },
1313
'ember-template-compiler': {
1414
trees: null,
@@ -27,10 +27,10 @@ module.exports = function() {
2727
]
2828
},
2929
'ember-routing': { trees: null, vendorRequirements: ['router', 'route-recognizer'],
30-
requirements: ['ember-runtime', 'ember-views'] },
31-
'ember-application': { trees: null, vendorRequirements: ['dag-map'], requirements: ['ember-routing'] },
30+
requirements: ['ember-runtime', 'ember-views'], requiresJQuery: false },
31+
'ember-application': { trees: null, vendorRequirements: ['dag-map'], requirements: ['ember-routing'], requiresJQuery: false },
3232
'ember': { trees: null, requirements: ['ember-application'] },
33-
'internal-test-helpers': { trees: null },
33+
'internal-test-helpers': { trees: null, requiresJQuery: false },
3434

3535
'ember-glimmer': {
3636
trees: null,
@@ -43,7 +43,7 @@ module.exports = function() {
4343
'@glimmer/wire-format',
4444
'@glimmer/node'
4545
],
46-
testingVendorRequirements: []
46+
testingVendorRequirements: [],
4747
}
4848
};
4949

0 commit comments

Comments
 (0)