Skip to content

Commit

Permalink
chore: untangle deps and fix broken test (#502)
Browse files Browse the repository at this point in the history
* chore(deps): untangle miragejs dependency

* chore(deps): upgrade engines, embroider, et alii

* test(edit-form): repair router service injection
  • Loading branch information
derrabauke authored Jun 9, 2022
1 parent c591a95 commit 5592acc
Show file tree
Hide file tree
Showing 3 changed files with 1,596 additions and 1,560 deletions.
17 changes: 7 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,20 @@
"@commitlint/cli": "16.2.4",
"@commitlint/config-conventional": "16.2.1",
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.7.0",
"@embroider/test-setup": "1.6.0",
"@ember/test-helpers": "2.8.1",
"@embroider/test-setup": "1.7.1",
"@faker-js/faker": "6.2.0",
"babel-eslint": "10.1.0",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.28.5",
"ember-cli-dependency-checker": "3.3.1",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.0-alpha.2",
"ember-cli-mirage": "3.0.0-alpha.3",
"ember-cli-sass": "11.0.1",
"ember-cli-sri": "2.1.1",
"ember-cli-uglify": "3.0.0",
"ember-disable-prototype-extensions": "1.1.3",
"ember-engines": "0.8.20",
"ember-engines": "0.8.22",
"ember-export-application-global": "2.0.1",
"ember-load-initializers": "2.1.2",
"ember-maybe-import-regenerator": "1.0.0",
Expand All @@ -92,19 +92,19 @@
"ember-try": "2.0.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-ember": "10.6.0",
"eslint-plugin-ember": "10.6.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-qunit": "7.2.0",
"husky": "7.0.4",
"lint-staged": "12.4.1",
"loader.js": "4.7.0",
"miragejs": "0.1.43",
"miragejs": "0.1.45",
"npm-package-json-lint": "6.3.0",
"npm-run-all": "4.1.5",
"prettier": "2.6.2",
"qunit": "2.19.0",
"qunit": "2.19.1",
"qunit-dom": "2.0.0",
"sass": "1.51.0",
"tracked-toolbox": "1.2.3",
Expand All @@ -121,8 +121,5 @@
},
"release": {
"extends": "@adfinis-sygroup/semantic-release-config"
},
"resolutions": {
"ember-engines": "https://gitpkg.now.sh/ember-engines/ember-engines/packages/ember-engines?4d8a7607ed690053f6e8ab4f35f9dfa543a3697f"
}
}
31 changes: 13 additions & 18 deletions tests/integration/components/edit-form-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,19 @@ module("Integration | Component | edit-form", function (hooks) {
setupIntl(hooks);

hooks.beforeEach(function () {
const router = class {
replaceWith() {}
hasRoute() {}
transitionTo() {}
_doTransition() {}
generateURL() {}
currentRoute = {
parent: {
name: "ember-emeis.parent-route",
},
};
};
this.router = new router();
this.owner.register("service:router", this.router, { instantiate: false });
this.owner.register("service:-routing", this.router, {
instantiate: false,
});
this.owner.register("router:main", this.router, { instantiate: false });
this.owner.unregister("service:router");
this.owner.register(
"service:router",
class extends Service {
currentRoute = {
name: "ember-emeis.parent-route.edit",
parent: {
name: "ember-emeis.parent-route",
},
};
}
);
this.router = this.owner.lookup("service:router");
this.owner.register("service:emeis-options", EmeisOptionsStub);
});

Expand Down
Loading

0 comments on commit 5592acc

Please sign in to comment.