Skip to content

Commit

Permalink
Merge pull request #2099 from embroider-build/update-test-matrix
Browse files Browse the repository at this point in the history
Update test matrix
  • Loading branch information
ef4 authored Sep 7, 2024
2 parents dce753f + e916a51 commit 99a3649
Show file tree
Hide file tree
Showing 8 changed files with 186,768 additions and 21 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"[email protected]": "5.0.0"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
},
"devDependencies": {
Expand Down
186,746 changes: 186,746 additions & 0 deletions patches/[email protected]

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions pnpm-lock.yaml

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

6 changes: 1 addition & 5 deletions tests/scenarios/engines-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,7 @@ let engineScenarios = appScenarios.map('engines', project => {
});

engineScenarios
.skip('lts_3_28-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip('lts_4_4-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip('release-engines') // this skip should be removed before https://github.com/embroider-build/embroider/pull/1435 is merged
.skip('lts_5_8-engines') // this shouldn't be run
.skip('canary-engines') // this shouldn't be run
.skip()
.map('without-fastboot', () => {})
.forEachScenario(scenario => {
Qmodule(scenario.name, function (hooks) {
Expand Down
3 changes: 1 addition & 2 deletions tests/scenarios/fastboot-app-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ appScenarios
merge(project.files, loadFromFixtureData('fastboot-app'));
})
// TODO remove once https://github.com/ember-fastboot/ember-cli-fastboot/issues/925 is fixed
.skip('lts_5_8-fastboot-app-test')
.skip('canary-fastboot-app-test')
.skip()
.forEachScenario(scenario => {
Qmodule(scenario.name, function (hooks) {
let app: PreparedApp;
Expand Down
1 change: 1 addition & 0 deletions tests/scenarios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
"ember-source-4.8": "npm:ember-source@~4.8.0",
"ember-source-5.4": "npm:ember-source@~5.4.0",
"ember-source-5.8": "npm:ember-source@~5.8.0",
"ember-source-5.11": "npm:[email protected]",
"ember-source-beta": "npm:ember-source@beta",
"ember-source-canary": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/370cf34f9e86df17b880f11fef35a5a0f24ff38a.tgz",
"ember-source-latest": "npm:ember-source@latest",
Expand Down
4 changes: 2 additions & 2 deletions tests/scenarios/scenarios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async function lts_5_8(project: Project) {
}

async function release(project: Project) {
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-latest' });
project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-5.11' });
project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-latest' });
project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
project.linkDevDependency('@ember/test-waiters', { baseDir: __dirname, resolveName: '@ember/test-waiters' });
Expand Down Expand Up @@ -83,7 +83,7 @@ export function supportMatrix(scenarios: Scenarios) {
// new vite based system is working as we like
.skip('lts_3_28')
.skip('lts_4_4')
.skip('release')
.skip('lts_5_8')
);
}

Expand Down
15 changes: 6 additions & 9 deletions tests/scenarios/watch-mode-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ import CommandWatcher, { DEFAULT_TIMEOUT } from './helpers/command-watcher';

const { module: Qmodule, test } = QUnit;

let app = appScenarios
.skip('canary')
.skip('lts_5_8')
.map('watch-mode', () => {
/**
* We will create files as a part of the watch-mode tests,
* because creating files should cause appropriate watch/update behavior
*/
});
let app = appScenarios.skip().map('watch-mode', () => {
/**
* We will create files as a part of the watch-mode tests,
* because creating files should cause appropriate watch/update behavior
*/
});

class File {
constructor(readonly label: string, readonly fullPath: string) {}
Expand Down

0 comments on commit 99a3649

Please sign in to comment.