diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c877fb1dc1e..99bc9219276 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1596,137 +1596,6 @@ importers: '@ember-data/private-build-infra': injected: 'true' - tests/adapter-encapsulation: - dependencies: - '@babel/core': - specifier: ^7.23.0 - version: 7.23.0(supports-color@8.1.1) - '@babel/runtime': - specifier: ^7.23.1 - version: 7.23.1 - '@ember-data/debug': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/debug(@ember-data/store@5.5.0-alpha.11)(@ember/string@3.1.1) - '@ember-data/graph': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/graph(@babel/core@7.23.0)(@ember-data/store@5.5.0-alpha.11) - '@ember-data/json-api': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/json-api(@babel/core@7.23.0)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/request-utils@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(ember-inflector@4.0.2) - '@ember-data/legacy-compat': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/legacy-compat(@babel/core@7.23.0)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/request@5.5.0-alpha.11) - '@ember-data/model': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/model(@babel/core@7.23.0)(@ember-data/debug@5.5.0-alpha.11)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/legacy-compat@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/request': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/request(@babel/core@7.23.0) - '@ember-data/request-utils': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/request-utils(@babel/core@7.23.0) - '@ember-data/serializer': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/serializer(@babel/core@7.23.0)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/store': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/store(@babel/core@7.23.0)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2) - '@ember-data/tracking': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/tracking(@babel/core@7.23.0)(ember-source@5.3.0) - '@ember-data/unpublished-test-infra': - specifier: workspace:5.5.0-alpha.11 - version: file:packages/unpublished-test-infra(@babel/core@7.23.0)(qunit@2.19.4) - '@ember/optional-features': - specifier: ^2.0.0 - version: 2.0.0 - '@ember/string': - specifier: 3.1.1 - version: 3.1.1(@babel/core@7.23.0) - '@ember/test-helpers': - specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.23.0)(ember-source@5.3.0)(webpack@5.88.2) - '@glimmer/component': - specifier: ^1.1.2 - version: 1.1.2(@babel/core@7.23.0) - '@glimmer/tracking': - specifier: ^1.1.2 - version: 1.1.2 - '@types/ember__owner': - specifier: ^4.0.6 - version: 4.0.6 - ember-auto-import: - specifier: ^2.6.3 - version: 2.6.3(webpack@5.88.2) - ember-cli: - specifier: ~5.3.0 - version: 5.3.0(debug@4.3.4) - ember-cli-babel: - specifier: ^8.1.0 - version: 8.1.0(@babel/core@7.23.0) - ember-cli-dependency-checker: - specifier: ^3.3.2 - version: 3.3.2(ember-cli@5.3.0) - ember-cli-htmlbars: - specifier: ^6.3.0 - version: 6.3.0 - ember-cli-inject-live-reload: - specifier: ^2.1.0 - version: 2.1.0 - ember-inflector: - specifier: ^4.0.2 - version: 4.0.2(@babel/core@7.23.0) - ember-load-initializers: - specifier: ^2.1.2 - version: 2.1.2(@babel/core@7.23.0) - ember-maybe-import-regenerator: - specifier: ^1.0.0 - version: 1.0.0(@babel/core@7.23.0) - ember-qunit: - specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.23.0)(@ember/test-helpers@3.2.0)(ember-source@5.3.0)(qunit@2.19.4) - ember-resolver: - specifier: ^11.0.1 - version: 11.0.1(@babel/core@7.23.0)(ember-source@5.3.0) - ember-source: - specifier: ~5.3.0 - version: 5.3.0(@babel/core@7.23.0)(@glimmer/component@1.1.2)(webpack@5.88.2) - loader.js: - specifier: ^4.7.0 - version: 4.7.0 - qunit: - specifier: 2.19.4 - version: 2.19.4(patch_hash=h2fz5inojlzu6daraxt5bghsqy) - qunit-dom: - specifier: ^2.0.0 - version: 2.0.0(@babel/core@7.23.0) - webpack: - specifier: ^5.88.2 - version: 5.88.2 - dependenciesMeta: - '@ember-data/debug': - injected: true - '@ember-data/graph': - injected: true - '@ember-data/json-api': - injected: true - '@ember-data/legacy-compat': - injected: true - '@ember-data/model': - injected: true - '@ember-data/request': - injected: true - '@ember-data/request-utils': - injected: true - '@ember-data/serializer': - injected: true - '@ember-data/store': - injected: true - '@ember-data/tracking': - injected: true - '@ember-data/unpublished-test-infra': - injected: true - tests/blueprints: devDependencies: '@babel/core': @@ -2057,6 +1926,137 @@ importers: specifier: 2.19.4 version: 2.19.4(patch_hash=h2fz5inojlzu6daraxt5bghsqy) + tests/ember-data__adapter: + dependencies: + '@babel/core': + specifier: ^7.23.0 + version: 7.23.0(supports-color@8.1.1) + '@babel/runtime': + specifier: ^7.23.1 + version: 7.23.1 + '@ember-data/debug': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/debug(@ember-data/store@5.5.0-alpha.11)(@ember/string@3.1.1) + '@ember-data/graph': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/graph(@babel/core@7.23.0)(@ember-data/store@5.5.0-alpha.11) + '@ember-data/json-api': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/json-api(@babel/core@7.23.0)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/request-utils@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(ember-inflector@4.0.2) + '@ember-data/legacy-compat': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/legacy-compat(@babel/core@7.23.0)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/request@5.5.0-alpha.11) + '@ember-data/model': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/model(@babel/core@7.23.0)(@ember-data/debug@5.5.0-alpha.11)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/legacy-compat@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(ember-inflector@4.0.2) + '@ember-data/request': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/request(@babel/core@7.23.0) + '@ember-data/request-utils': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/request-utils(@babel/core@7.23.0) + '@ember-data/serializer': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/serializer(@babel/core@7.23.0)(@ember/string@3.1.1)(ember-inflector@4.0.2) + '@ember-data/store': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/store(@babel/core@7.23.0)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2) + '@ember-data/tracking': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/tracking(@babel/core@7.23.0)(ember-source@5.3.0) + '@ember-data/unpublished-test-infra': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/unpublished-test-infra(@babel/core@7.23.0)(qunit@2.19.4) + '@ember/optional-features': + specifier: ^2.0.0 + version: 2.0.0 + '@ember/string': + specifier: 3.1.1 + version: 3.1.1(@babel/core@7.23.0) + '@ember/test-helpers': + specifier: ^3.2.0 + version: 3.2.0(@babel/core@7.23.0)(ember-source@5.3.0)(webpack@5.88.2) + '@glimmer/component': + specifier: ^1.1.2 + version: 1.1.2(@babel/core@7.23.0) + '@glimmer/tracking': + specifier: ^1.1.2 + version: 1.1.2 + '@types/ember__owner': + specifier: ^4.0.6 + version: 4.0.6 + ember-auto-import: + specifier: ^2.6.3 + version: 2.6.3(webpack@5.88.2) + ember-cli: + specifier: ~5.3.0 + version: 5.3.0(debug@4.3.4) + ember-cli-babel: + specifier: ^8.1.0 + version: 8.1.0(@babel/core@7.23.0) + ember-cli-dependency-checker: + specifier: ^3.3.2 + version: 3.3.2(ember-cli@5.3.0) + ember-cli-htmlbars: + specifier: ^6.3.0 + version: 6.3.0 + ember-cli-inject-live-reload: + specifier: ^2.1.0 + version: 2.1.0 + ember-inflector: + specifier: ^4.0.2 + version: 4.0.2(@babel/core@7.23.0) + ember-load-initializers: + specifier: ^2.1.2 + version: 2.1.2(@babel/core@7.23.0) + ember-maybe-import-regenerator: + specifier: ^1.0.0 + version: 1.0.0(@babel/core@7.23.0) + ember-qunit: + specifier: ^8.0.1 + version: 8.0.1(@babel/core@7.23.0)(@ember/test-helpers@3.2.0)(ember-source@5.3.0)(qunit@2.19.4) + ember-resolver: + specifier: ^11.0.1 + version: 11.0.1(@babel/core@7.23.0)(ember-source@5.3.0) + ember-source: + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.0)(@glimmer/component@1.1.2)(webpack@5.88.2) + loader.js: + specifier: ^4.7.0 + version: 4.7.0 + qunit: + specifier: 2.19.4 + version: 2.19.4(patch_hash=h2fz5inojlzu6daraxt5bghsqy) + qunit-dom: + specifier: ^2.0.0 + version: 2.0.0(@babel/core@7.23.0) + webpack: + specifier: ^5.88.2 + version: 5.88.2 + dependenciesMeta: + '@ember-data/debug': + injected: true + '@ember-data/graph': + injected: true + '@ember-data/json-api': + injected: true + '@ember-data/legacy-compat': + injected: true + '@ember-data/model': + injected: true + '@ember-data/request': + injected: true + '@ember-data/request-utils': + injected: true + '@ember-data/serializer': + injected: true + '@ember-data/store': + injected: true + '@ember-data/tracking': + injected: true + '@ember-data/unpublished-test-infra': + injected: true + tests/ember-data__graph: devDependencies: '@babel/core': diff --git a/tests/adapter-encapsulation/README.md b/tests/adapter-encapsulation/README.md deleted file mode 100644 index 450c917cc8a..00000000000 --- a/tests/adapter-encapsulation/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# encapsulation-test-app - -This README outlines the details of collaborating on this Ember application. -A short introduction of this app could easily go here. - -## Prerequisites - -You will need the following things properly installed on your computer. - -* [Git](https://git-scm.com/) -* [Node.js](https://nodejs.org/) (with npm) -* [Ember CLI](https://ember-cli.com/) -* [Google Chrome](https://google.com/chrome/) - -## Installation - -* `git clone ` this repository -* `cd encapsulation-test-app` -* `npm install` - -## Running / Development - -* `ember serve` -* Visit your app at [http://localhost:4200](http://localhost:4200). -* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests). - -### Code Generators - -Make use of the many generators for code, try `ember help generate` for more details - -### Running Tests - -* `ember test` -* `ember test --server` - -### Linting - -* `npm run lint:hbs` -* `npm run lint:js` -* `npm run lint:js -- --fix` - -### Building - -* `ember build` (development) -* `ember build --environment production` (production) - -### Deploying - -Specify what it takes to deploy your app. - -## Further Reading / Useful Links - -* [ember.js](https://emberjs.com/) -* [ember-cli](https://ember-cli.com/) -* Development Browser Extensions - * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) - * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) diff --git a/tests/adapter-encapsulation/tests/integration/smoke-test.js b/tests/adapter-encapsulation/tests/integration/smoke-test.js deleted file mode 100644 index b5fcb0e9d3c..00000000000 --- a/tests/adapter-encapsulation/tests/integration/smoke-test.js +++ /dev/null @@ -1,45 +0,0 @@ -/* global require */ -import { module, test } from 'qunit'; - -import { setupTest } from 'ember-qunit'; - -function assertPackageNotPresent(packageName, assert) { - const entries = Object.keys(require.entries); - const entriesFromPackage = entries.filter((m) => m.indexOf(packageName) === 0); - const importedDependencies = {}; - const entriesImportingPackage = entries.filter((m) => { - const deps = require.entries[m].deps; - const moduleDeps = deps.filter((d) => d.indexOf(packageName) === 0); - - if (moduleDeps.length) { - importedDependencies[m] = moduleDeps; - } - return moduleDeps.length > 0; - }); - - assert.ok(entries.length > 0, 'We have modules'); - assert.ok( - entriesFromPackage.length === 0, - `We expect no modules from ${packageName} ${ - entriesFromPackage.length > 0 ? `found: [\n\t"${entriesFromPackage.join('",\n\t"')}"\n]` : '' - }` - ); - assert.ok( - entriesImportingPackage.length === 0, - `We expect no modules with dependencies on ${packageName} ${ - entriesImportingPackage.length > 0 ? `found:\n${JSON.stringify(importedDependencies, null, 2)}` : '' - }` - ); -} - -module('Adapter Encapsulation - Smoke Tests', function (hooks) { - setupTest(hooks); - - test('No @ember-data/adapter modules are present', function (assert) { - assertPackageNotPresent('@ember-data/adapter', assert); - }); - - test('No ember-data modules are present', function (assert) { - assertPackageNotPresent('ember-data', assert); - }); -}); diff --git a/tests/adapter-encapsulation/.ember-cli b/tests/ember-data__adapter/.ember-cli similarity index 100% rename from tests/adapter-encapsulation/.ember-cli rename to tests/ember-data__adapter/.ember-cli diff --git a/tests/adapter-encapsulation/.gitignore b/tests/ember-data__adapter/.gitignore similarity index 100% rename from tests/adapter-encapsulation/.gitignore rename to tests/ember-data__adapter/.gitignore diff --git a/tests/adapter-encapsulation/.template-lintrc.js b/tests/ember-data__adapter/.template-lintrc.js similarity index 100% rename from tests/adapter-encapsulation/.template-lintrc.js rename to tests/ember-data__adapter/.template-lintrc.js diff --git a/tests/adapter-encapsulation/.watchmanconfig b/tests/ember-data__adapter/.watchmanconfig similarity index 100% rename from tests/adapter-encapsulation/.watchmanconfig rename to tests/ember-data__adapter/.watchmanconfig diff --git a/tests/ember-data__adapter/README.md b/tests/ember-data__adapter/README.md new file mode 100644 index 00000000000..35beb9fcf76 --- /dev/null +++ b/tests/ember-data__adapter/README.md @@ -0,0 +1,12 @@ +# Tests for @ember-data/adapter + +This test-package provides tests for the `@ember-data/adapter` package. + +## Running Tests Locally + +If you do not already have the project cloned and dependencies installed, you may want to first read [Setting Up The Project](../../contributing/setting-up-the-project.md) + +```cli +cd tests/ember-data__adapter; +pnpm test; +``` diff --git a/tests/adapter-encapsulation/app/app.js b/tests/ember-data__adapter/app/app.js similarity index 100% rename from tests/adapter-encapsulation/app/app.js rename to tests/ember-data__adapter/app/app.js diff --git a/tests/adapter-encapsulation/app/components/.gitkeep b/tests/ember-data__adapter/app/components/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/components/.gitkeep rename to tests/ember-data__adapter/app/components/.gitkeep diff --git a/tests/adapter-encapsulation/app/controllers/.gitkeep b/tests/ember-data__adapter/app/controllers/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/controllers/.gitkeep rename to tests/ember-data__adapter/app/controllers/.gitkeep diff --git a/tests/adapter-encapsulation/app/helpers/.gitkeep b/tests/ember-data__adapter/app/helpers/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/helpers/.gitkeep rename to tests/ember-data__adapter/app/helpers/.gitkeep diff --git a/tests/adapter-encapsulation/app/index.html b/tests/ember-data__adapter/app/index.html similarity index 78% rename from tests/adapter-encapsulation/app/index.html rename to tests/ember-data__adapter/app/index.html index 51a527e7175..1e808480500 100644 --- a/tests/adapter-encapsulation/app/index.html +++ b/tests/ember-data__adapter/app/index.html @@ -3,14 +3,14 @@ - EncapsulationTestApp + @ember-data/adapter Tests {{content-for "head"}} - + {{content-for "head-footer"}} @@ -18,7 +18,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/tests/adapter-encapsulation/app/models/.gitkeep b/tests/ember-data__adapter/app/models/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/models/.gitkeep rename to tests/ember-data__adapter/app/models/.gitkeep diff --git a/tests/adapter-encapsulation/app/resolver.js b/tests/ember-data__adapter/app/resolver.js similarity index 100% rename from tests/adapter-encapsulation/app/resolver.js rename to tests/ember-data__adapter/app/resolver.js diff --git a/tests/adapter-encapsulation/app/router.js b/tests/ember-data__adapter/app/router.js similarity index 100% rename from tests/adapter-encapsulation/app/router.js rename to tests/ember-data__adapter/app/router.js diff --git a/tests/adapter-encapsulation/app/routes/.gitkeep b/tests/ember-data__adapter/app/routes/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/routes/.gitkeep rename to tests/ember-data__adapter/app/routes/.gitkeep diff --git a/tests/adapter-encapsulation/app/services/store.js b/tests/ember-data__adapter/app/services/store.js similarity index 100% rename from tests/adapter-encapsulation/app/services/store.js rename to tests/ember-data__adapter/app/services/store.js diff --git a/tests/adapter-encapsulation/app/styles/app.css b/tests/ember-data__adapter/app/styles/app.css similarity index 100% rename from tests/adapter-encapsulation/app/styles/app.css rename to tests/ember-data__adapter/app/styles/app.css diff --git a/tests/adapter-encapsulation/app/templates/application.hbs b/tests/ember-data__adapter/app/templates/application.hbs similarity index 100% rename from tests/adapter-encapsulation/app/templates/application.hbs rename to tests/ember-data__adapter/app/templates/application.hbs diff --git a/tests/adapter-encapsulation/app/templates/components/.gitkeep b/tests/ember-data__adapter/app/templates/components/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/app/templates/components/.gitkeep rename to tests/ember-data__adapter/app/templates/components/.gitkeep diff --git a/tests/adapter-encapsulation/config/environment.js b/tests/ember-data__adapter/config/environment.js similarity index 95% rename from tests/adapter-encapsulation/config/environment.js rename to tests/ember-data__adapter/config/environment.js index 1f345a934b9..427bedd99c4 100644 --- a/tests/adapter-encapsulation/config/environment.js +++ b/tests/ember-data__adapter/config/environment.js @@ -2,7 +2,7 @@ module.exports = function (environment) { let ENV = { - modulePrefix: 'adapter-encapsulation-test-app', + modulePrefix: 'ember-data__adapter', environment, rootURL: '/', locationType: 'history', diff --git a/tests/adapter-encapsulation/config/optional-features.json b/tests/ember-data__adapter/config/optional-features.json similarity index 100% rename from tests/adapter-encapsulation/config/optional-features.json rename to tests/ember-data__adapter/config/optional-features.json diff --git a/tests/adapter-encapsulation/config/targets.js b/tests/ember-data__adapter/config/targets.js similarity index 100% rename from tests/adapter-encapsulation/config/targets.js rename to tests/ember-data__adapter/config/targets.js diff --git a/tests/adapter-encapsulation/ember-cli-build.js b/tests/ember-data__adapter/ember-cli-build.js similarity index 100% rename from tests/adapter-encapsulation/ember-cli-build.js rename to tests/ember-data__adapter/ember-cli-build.js diff --git a/tests/adapter-encapsulation/package.json b/tests/ember-data__adapter/package.json similarity index 94% rename from tests/adapter-encapsulation/package.json rename to tests/ember-data__adapter/package.json index c7a8d4b0f72..8f05a31e2ac 100644 --- a/tests/adapter-encapsulation/package.json +++ b/tests/ember-data__adapter/package.json @@ -1,12 +1,12 @@ { - "name": "adapter-encapsulation-test-app", + "name": "ember-data__adapter", "version": "5.5.0-alpha.11", "private": true, - "description": "Small description for encapsulation-test-app goes here", + "description": "Tests for @ember-data/adapter", "repository": { "type": "git", "url": "https://github.com/emberjs/data.git", - "directory": "tests/adapter-encapsulation" + "directory": "tests/ember-data__adapter" }, "license": "MIT", "author": "", diff --git a/tests/adapter-encapsulation/public/robots.txt b/tests/ember-data__adapter/public/robots.txt similarity index 100% rename from tests/adapter-encapsulation/public/robots.txt rename to tests/ember-data__adapter/public/robots.txt diff --git a/tests/adapter-encapsulation/testem.js b/tests/ember-data__adapter/testem.js similarity index 100% rename from tests/adapter-encapsulation/testem.js rename to tests/ember-data__adapter/testem.js diff --git a/tests/adapter-encapsulation/tests/helpers/.gitkeep b/tests/ember-data__adapter/tests/helpers/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/tests/helpers/.gitkeep rename to tests/ember-data__adapter/tests/helpers/.gitkeep diff --git a/tests/adapter-encapsulation/tests/index.html b/tests/ember-data__adapter/tests/index.html similarity index 82% rename from tests/adapter-encapsulation/tests/index.html rename to tests/ember-data__adapter/tests/index.html index 65eb49adaae..d2edd4eccbd 100644 --- a/tests/adapter-encapsulation/tests/index.html +++ b/tests/ember-data__adapter/tests/index.html @@ -3,7 +3,7 @@ - EncapsulationTestApp Tests + @ember-data/adapter Tests @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} @@ -31,7 +31,7 @@ - + {{content-for "body-footer"}} diff --git a/tests/adapter-encapsulation/tests/integration/.gitkeep b/tests/ember-data__adapter/tests/integration/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/tests/integration/.gitkeep rename to tests/ember-data__adapter/tests/integration/.gitkeep diff --git a/tests/adapter-encapsulation/tests/integration/belongs-to-test.js b/tests/ember-data__adapter/tests/integration/belongs-to-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/belongs-to-test.js rename to tests/ember-data__adapter/tests/integration/belongs-to-test.js index e49f1d3d634..81d9b15ac3b 100644 --- a/tests/adapter-encapsulation/tests/integration/belongs-to-test.js +++ b/tests/ember-data__adapter/tests/integration/belongs-to-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/coalescing-test.js b/tests/ember-data__adapter/tests/integration/coalescing-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/coalescing-test.js rename to tests/ember-data__adapter/tests/integration/coalescing-test.js index 7a4ee0b1ea0..35250b724ea 100644 --- a/tests/adapter-encapsulation/tests/integration/coalescing-test.js +++ b/tests/ember-data__adapter/tests/integration/coalescing-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/generate-id-test.js b/tests/ember-data__adapter/tests/integration/generate-id-test.js similarity index 97% rename from tests/adapter-encapsulation/tests/integration/generate-id-test.js rename to tests/ember-data__adapter/tests/integration/generate-id-test.js index 11df8118627..ba5e7e24713 100644 --- a/tests/adapter-encapsulation/tests/integration/generate-id-test.js +++ b/tests/ember-data__adapter/tests/integration/generate-id-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/has-many-test.js b/tests/ember-data__adapter/tests/integration/has-many-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/has-many-test.js rename to tests/ember-data__adapter/tests/integration/has-many-test.js index 937aec892c1..78cd62e2422 100644 --- a/tests/adapter-encapsulation/tests/integration/has-many-test.js +++ b/tests/ember-data__adapter/tests/integration/has-many-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/mutations-test.js b/tests/ember-data__adapter/tests/integration/mutations-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/mutations-test.js rename to tests/ember-data__adapter/tests/integration/mutations-test.js index 5bd7b3d3aeb..6a04ea76242 100644 --- a/tests/adapter-encapsulation/tests/integration/mutations-test.js +++ b/tests/ember-data__adapter/tests/integration/mutations-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/queries-test.js b/tests/ember-data__adapter/tests/integration/queries-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/queries-test.js rename to tests/ember-data__adapter/tests/integration/queries-test.js index 29ab11bfa1f..9f9eaaccffe 100644 --- a/tests/adapter-encapsulation/tests/integration/queries-test.js +++ b/tests/ember-data__adapter/tests/integration/queries-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/integration/reload-test.js b/tests/ember-data__adapter/tests/integration/reload-test.js similarity index 99% rename from tests/adapter-encapsulation/tests/integration/reload-test.js rename to tests/ember-data__adapter/tests/integration/reload-test.js index 31cd95c89b4..94ef4ec755b 100644 --- a/tests/adapter-encapsulation/tests/integration/reload-test.js +++ b/tests/ember-data__adapter/tests/integration/reload-test.js @@ -1,8 +1,8 @@ import EmberObject from '@ember/object'; -import Store from 'adapter-encapsulation-test-app/services/store'; import { module, test } from 'qunit'; +import Store from 'ember-data__adapter/services/store'; import { setupTest } from 'ember-qunit'; import Model, { attr } from '@ember-data/model'; diff --git a/tests/adapter-encapsulation/tests/test-helper.js b/tests/ember-data__adapter/tests/test-helper.js similarity index 100% rename from tests/adapter-encapsulation/tests/test-helper.js rename to tests/ember-data__adapter/tests/test-helper.js diff --git a/tests/adapter-encapsulation/tests/unit/.gitkeep b/tests/ember-data__adapter/tests/unit/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/tests/unit/.gitkeep rename to tests/ember-data__adapter/tests/unit/.gitkeep diff --git a/tests/adapter-encapsulation/vendor/.gitkeep b/tests/ember-data__adapter/vendor/.gitkeep similarity index 100% rename from tests/adapter-encapsulation/vendor/.gitkeep rename to tests/ember-data__adapter/vendor/.gitkeep