diff --git a/package.json b/package.json index 3667381e5..226d63091 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,6 @@ "@embroider/macros": "1.6.0", "@embroider/shared-internals": "1.6.0", "@embroider/util": "1.6.0", - "babel-import-util": "1.2.2", "colors": "1.4.0", "favicons": "5.3.0" }, diff --git a/tests/dummy/app/pods/docs/index/route.js b/tests/dummy/app/pods/docs/index/route.js deleted file mode 100644 index 5233953c9..000000000 --- a/tests/dummy/app/pods/docs/index/route.js +++ /dev/null @@ -1,7 +0,0 @@ -import Route from '@ember/routing/route'; - -export default class extends Route { - beforeModel() { - this.transitionTo('docs.getting-started.what-is-mirage'); - } -} diff --git a/tests/dummy/app/pods/docs/template.hbs b/tests/dummy/app/pods/docs/template.hbs deleted file mode 100644 index cfcfa84ac..000000000 --- a/tests/dummy/app/pods/docs/template.hbs +++ /dev/null @@ -1,46 +0,0 @@ - - - - {{nav.section "Getting started"}} - {{nav.item "What is Mirage?" "docs.getting-started.what-is-mirage"}} - {{nav.item "Installation" "docs.getting-started.installation"}} - {{nav.item "Upgrade guide" "docs.getting-started.upgrade-guide"}} - {{nav.item "Overview" "docs.getting-started.overview"}} - - {{nav.section "Route handlers"}} - {{nav.item "Functions" "docs.route-handlers.functions"}} - {{nav.item "Shorthands" "docs.route-handlers.shorthands"}} - - {{nav.section "Data layer"}} - {{nav.item "The Database" "docs.data-layer.database"}} - {{nav.item "Why an ORM?" "docs.data-layer.orm"}} - {{nav.item "Models" "docs.data-layer.models"}} - {{nav.item "Relationships" "docs.data-layer.relationships"}} - {{nav.item "Factories" "docs.data-layer.factories"}} - {{nav.item "Fixtures" "docs.data-layer.fixtures"}} - {{nav.item "Serializers" "docs.data-layer.serializers"}} - - {{nav.item "Ember Data Serializer" "docs.data-layer.serializers.ember-data-serializer"}} - - - {{nav.section "Testing"}} - {{nav.item "setupMirage test helper" "docs.testing.seupt-mirage"}} - {{nav.item "Acceptance tests" "docs.testing.acceptance-tests"}} - {{nav.item "Integration and unit tests" "docs.testing.integration-and-unit-tests"}} - {{nav.item "Assertions" "docs.testing.assertions"}} - - {{nav.section "Advanced"}} - {{nav.item "Environment options" "docs.advanced.environment-options"}} - {{nav.item "Server Configuration" "docs.advanced.server-configuration"}} - {{nav.item "Simulating cookie responses" "docs.advanced.simulating-cookie-responses"}} - {{nav.item "Mocking GUIDs" "docs.advanced.mocking-guids"}} - {{nav.item "Customizing the inflector" "docs.advanced.customizing-the-inflector"}} - {{nav.item "Switching between scenarios" "docs.advanced.switching-between-scenarios"}} - - - - - {{outlet}} - - - diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index c68a6ae3b..135f6f2f9 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -33,6 +33,7 @@ Router.map(function () { }); this.route('testing', function () { + this.route('setup-mirage'); this.route('acceptance-tests'); this.route('integration-and-unit-tests'); this.route('assertions'); diff --git a/tests/dummy/app/pods/application/route.js b/tests/dummy/app/routes/application.js similarity index 100% rename from tests/dummy/app/pods/application/route.js rename to tests/dummy/app/routes/application.js diff --git a/tests/dummy/app/pods/blog/detail/route.js b/tests/dummy/app/routes/blog/detail.js similarity index 70% rename from tests/dummy/app/pods/blog/detail/route.js rename to tests/dummy/app/routes/blog/detail.js index 051773a7e..ed59fb55a 100644 --- a/tests/dummy/app/pods/blog/detail/route.js +++ b/tests/dummy/app/routes/blog/detail.js @@ -1,11 +1,15 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default class extends Route { + @service router; + @service store; + model({ post_slug_and_id }) { let matches = post_slug_and_id.match(/\d+$/); if (!matches) { let path = document.location.pathname.replace(/^\/|\/$/g, ''); - this.transitionTo('not-found', path); + this.router.transitionTo('not-found', path); } let postId = matches[0]; diff --git a/tests/dummy/app/pods/blog/index/route.js b/tests/dummy/app/routes/blog/index.js similarity index 100% rename from tests/dummy/app/pods/blog/index/route.js rename to tests/dummy/app/routes/blog/index.js diff --git a/tests/dummy/app/routes/docs/index.js b/tests/dummy/app/routes/docs/index.js new file mode 100644 index 000000000..e755cbd32 --- /dev/null +++ b/tests/dummy/app/routes/docs/index.js @@ -0,0 +1,10 @@ +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; + +export default class extends Route { + @service router; + + beforeModel() { + this.router.transitionTo('docs.getting-started.what-is-mirage'); + } +} diff --git a/tests/dummy/app/pods/not-found/route.js b/tests/dummy/app/routes/not-found.js similarity index 92% rename from tests/dummy/app/pods/not-found/route.js rename to tests/dummy/app/routes/not-found.js index b65e31d9a..7c3c690b6 100644 --- a/tests/dummy/app/pods/not-found/route.js +++ b/tests/dummy/app/routes/not-found.js @@ -1,13 +1,19 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; export default class extends Route { + @service router; + beforeModel() { let { path } = this.paramsFor('not-found'); this.redirects.forEach((redirect) => { redirect.from.forEach((candidate) => { if (path === candidate || path === `${candidate}/`) { - this.transitionTo('blog.detail', redirect.to.replace('blog/', '')); + this.router.transitionTo( + 'blog.detail', + redirect.to.replace('blog/', '') + ); } }); }); diff --git a/tests/dummy/app/templates/.gitkeep b/tests/dummy/app/templates/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/dummy/app/pods/application/template.hbs b/tests/dummy/app/templates/application.hbs similarity index 64% rename from tests/dummy/app/pods/application/template.hbs rename to tests/dummy/app/templates/application.hbs index 445adab58..2a35277ca 100644 --- a/tests/dummy/app/pods/application/template.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,7 +1,7 @@ - {{#header.link "blog"}} + Blog - {{/header.link}} + {{outlet}} diff --git a/tests/dummy/app/pods/blog/template.hbs b/tests/dummy/app/templates/blog.hbs similarity index 100% rename from tests/dummy/app/pods/blog/template.hbs rename to tests/dummy/app/templates/blog.hbs diff --git a/tests/dummy/app/pods/blog/detail/template.hbs b/tests/dummy/app/templates/blog/detail.hbs similarity index 100% rename from tests/dummy/app/pods/blog/detail/template.hbs rename to tests/dummy/app/templates/blog/detail.hbs diff --git a/tests/dummy/app/pods/blog/error/template.hbs b/tests/dummy/app/templates/blog/error.hbs similarity index 100% rename from tests/dummy/app/pods/blog/error/template.hbs rename to tests/dummy/app/templates/blog/error.hbs diff --git a/tests/dummy/app/pods/blog/index/template.hbs b/tests/dummy/app/templates/blog/index.hbs similarity index 100% rename from tests/dummy/app/pods/blog/index/template.hbs rename to tests/dummy/app/templates/blog/index.hbs diff --git a/tests/dummy/app/templates/docs.hbs b/tests/dummy/app/templates/docs.hbs new file mode 100644 index 000000000..3eb2eed04 --- /dev/null +++ b/tests/dummy/app/templates/docs.hbs @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{outlet}} + + + diff --git a/tests/dummy/app/pods/docs/advanced/customizing-the-inflector/template.md b/tests/dummy/app/templates/docs/advanced/customizing-the-inflector.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/customizing-the-inflector/template.md rename to tests/dummy/app/templates/docs/advanced/customizing-the-inflector.md diff --git a/tests/dummy/app/pods/docs/advanced/environment-options/template.md b/tests/dummy/app/templates/docs/advanced/environment-options.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/environment-options/template.md rename to tests/dummy/app/templates/docs/advanced/environment-options.md diff --git a/tests/dummy/app/pods/docs/advanced/mocking-guids/template.md b/tests/dummy/app/templates/docs/advanced/mocking-guids.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/mocking-guids/template.md rename to tests/dummy/app/templates/docs/advanced/mocking-guids.md diff --git a/tests/dummy/app/pods/docs/advanced/server-configuration/template.md b/tests/dummy/app/templates/docs/advanced/server-configuration.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/server-configuration/template.md rename to tests/dummy/app/templates/docs/advanced/server-configuration.md diff --git a/tests/dummy/app/pods/docs/advanced/simulating-cookie-responses/template.md b/tests/dummy/app/templates/docs/advanced/simulating-cookie-responses.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/simulating-cookie-responses/template.md rename to tests/dummy/app/templates/docs/advanced/simulating-cookie-responses.md diff --git a/tests/dummy/app/pods/docs/advanced/switching-between-scenarios/template.md b/tests/dummy/app/templates/docs/advanced/switching-between-scenarios.md similarity index 100% rename from tests/dummy/app/pods/docs/advanced/switching-between-scenarios/template.md rename to tests/dummy/app/templates/docs/advanced/switching-between-scenarios.md diff --git a/tests/dummy/app/pods/docs/data-layer/database/template.md b/tests/dummy/app/templates/docs/data-layer/database.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/database/template.md rename to tests/dummy/app/templates/docs/data-layer/database.md diff --git a/tests/dummy/app/pods/docs/data-layer/factories/template.md b/tests/dummy/app/templates/docs/data-layer/factories.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/factories/template.md rename to tests/dummy/app/templates/docs/data-layer/factories.md diff --git a/tests/dummy/app/pods/docs/data-layer/fixtures/template.md b/tests/dummy/app/templates/docs/data-layer/fixtures.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/fixtures/template.md rename to tests/dummy/app/templates/docs/data-layer/fixtures.md diff --git a/tests/dummy/app/pods/docs/data-layer/models/template.md b/tests/dummy/app/templates/docs/data-layer/models.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/models/template.md rename to tests/dummy/app/templates/docs/data-layer/models.md diff --git a/tests/dummy/app/pods/docs/data-layer/orm/template.md b/tests/dummy/app/templates/docs/data-layer/orm.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/orm/template.md rename to tests/dummy/app/templates/docs/data-layer/orm.md diff --git a/tests/dummy/app/pods/docs/data-layer/relationships/template.md b/tests/dummy/app/templates/docs/data-layer/relationships.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/relationships/template.md rename to tests/dummy/app/templates/docs/data-layer/relationships.md diff --git a/tests/dummy/app/pods/docs/data-layer/serializers/ember-data-serializer/template.md b/tests/dummy/app/templates/docs/data-layer/serializers/ember-data-serializer.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/serializers/ember-data-serializer/template.md rename to tests/dummy/app/templates/docs/data-layer/serializers/ember-data-serializer.md diff --git a/tests/dummy/app/pods/docs/data-layer/serializers/index/template.md b/tests/dummy/app/templates/docs/data-layer/serializers/index.md similarity index 100% rename from tests/dummy/app/pods/docs/data-layer/serializers/index/template.md rename to tests/dummy/app/templates/docs/data-layer/serializers/index.md diff --git a/tests/dummy/app/pods/docs/getting-started/installation/template.md b/tests/dummy/app/templates/docs/getting-started/installation.md similarity index 100% rename from tests/dummy/app/pods/docs/getting-started/installation/template.md rename to tests/dummy/app/templates/docs/getting-started/installation.md diff --git a/tests/dummy/app/pods/docs/getting-started/overview/template.md b/tests/dummy/app/templates/docs/getting-started/overview.md similarity index 100% rename from tests/dummy/app/pods/docs/getting-started/overview/template.md rename to tests/dummy/app/templates/docs/getting-started/overview.md diff --git a/tests/dummy/app/pods/docs/getting-started/upgrade-guide/index/template.md b/tests/dummy/app/templates/docs/getting-started/upgrade-guide/index.md similarity index 100% rename from tests/dummy/app/pods/docs/getting-started/upgrade-guide/index/template.md rename to tests/dummy/app/templates/docs/getting-started/upgrade-guide/index.md diff --git a/tests/dummy/app/pods/docs/getting-started/upgrade-guide/v2-deprecations/template.md b/tests/dummy/app/templates/docs/getting-started/upgrade-guide/v2-deprecations.md similarity index 100% rename from tests/dummy/app/pods/docs/getting-started/upgrade-guide/v2-deprecations/template.md rename to tests/dummy/app/templates/docs/getting-started/upgrade-guide/v2-deprecations.md diff --git a/tests/dummy/app/pods/docs/getting-started/what-is-mirage/template.md b/tests/dummy/app/templates/docs/getting-started/what-is-mirage.md similarity index 100% rename from tests/dummy/app/pods/docs/getting-started/what-is-mirage/template.md rename to tests/dummy/app/templates/docs/getting-started/what-is-mirage.md diff --git a/tests/dummy/app/pods/docs/route-handlers/functions/template.md b/tests/dummy/app/templates/docs/route-handlers/functions.md similarity index 100% rename from tests/dummy/app/pods/docs/route-handlers/functions/template.md rename to tests/dummy/app/templates/docs/route-handlers/functions.md diff --git a/tests/dummy/app/pods/docs/route-handlers/shorthands/template.md b/tests/dummy/app/templates/docs/route-handlers/shorthands.md similarity index 100% rename from tests/dummy/app/pods/docs/route-handlers/shorthands/template.md rename to tests/dummy/app/templates/docs/route-handlers/shorthands.md diff --git a/tests/dummy/app/pods/docs/testing/acceptance-tests/template.md b/tests/dummy/app/templates/docs/testing/acceptance-tests.md similarity index 100% rename from tests/dummy/app/pods/docs/testing/acceptance-tests/template.md rename to tests/dummy/app/templates/docs/testing/acceptance-tests.md diff --git a/tests/dummy/app/pods/docs/testing/assertions/template.md b/tests/dummy/app/templates/docs/testing/assertions.md similarity index 100% rename from tests/dummy/app/pods/docs/testing/assertions/template.md rename to tests/dummy/app/templates/docs/testing/assertions.md diff --git a/tests/dummy/app/pods/docs/testing/integration-and-unit-tests/template.md b/tests/dummy/app/templates/docs/testing/integration-and-unit-tests.md similarity index 100% rename from tests/dummy/app/pods/docs/testing/integration-and-unit-tests/template.md rename to tests/dummy/app/templates/docs/testing/integration-and-unit-tests.md diff --git a/tests/dummy/app/pods/docs/testing/setup-mirage/template.md b/tests/dummy/app/templates/docs/testing/setup-mirage.md similarity index 100% rename from tests/dummy/app/pods/docs/testing/setup-mirage/template.md rename to tests/dummy/app/templates/docs/testing/setup-mirage.md diff --git a/tests/dummy/app/pods/index/template.hbs b/tests/dummy/app/templates/index.hbs similarity index 100% rename from tests/dummy/app/pods/index/template.hbs rename to tests/dummy/app/templates/index.hbs diff --git a/tests/dummy/app/pods/not-found/template.hbs b/tests/dummy/app/templates/not-found.hbs similarity index 100% rename from tests/dummy/app/pods/not-found/template.hbs rename to tests/dummy/app/templates/not-found.hbs diff --git a/yarn.lock b/yarn.lock index a55678e65..a8f951e26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3879,7 +3879,12 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-import-util@1.2.2, babel-import-util@^0.2.0, babel-import-util@^1.1.0: +babel-import-util@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23" + integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag== + +babel-import-util@^1.1.0: version "1.2.2" resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495" integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==