diff --git a/.eslintrc.js b/.eslintrc.js
index 6ad524f8d00..8986b517070 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -104,7 +104,7 @@ module.exports = {
},
overrides: [
{
- files: ['tests/json-api/**', 'tests/graph/**', 'tests/request/**'],
+ files: ['tests/json-api/**', 'tests/ember-data__graph/**', 'tests/request/**'],
rules: {
'qunit/no-assert-equal': 'off',
'qunit/no-assert-logical-expression': 'off',
diff --git a/package.json b/package.json
index 2975f433687..e781203c823 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
"lint:js": "eslint --quiet --cache --cache-strategy=content --ext=js,ts .",
"preinstall": "npx only-allow pnpm",
"problems": "tsc -p tsconfig.json --noEmit --pretty false",
- "test": "pnpm --filter --filter 'ember-data__*' main-test-app --filter graph-test-app --filter json-api-test-app --filter request-test-app --filter builders-test-app run test",
- "test:production": "pnpm --filter main-test-app --filter graph-test-app --filter json-api-test-app run test -e production",
+ "test": "pnpm --filter --filter 'ember-data__*' main-test-app --filter json-api-test-app --filter request-test-app --filter builders-test-app run test",
+ "test:production": "pnpm --filter main-test-app --filter ember-data__graph --filter json-api-test-app run test -e production",
"test:try-one": "pnpm --filter main-test-app run test:try-one",
"test:docs": "pnpm build:docs && pnpm --filter docs-tests test",
"test:encapsulation": "pnpm --filter '*-encapsulation-test-app' run test",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07e41214865..c877fb1dc1e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2057,6 +2057,158 @@ importers:
specifier: 2.19.4
version: 2.19.4(patch_hash=h2fz5inojlzu6daraxt5bghsqy)
+ tests/ember-data__graph:
+ devDependencies:
+ '@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/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/private-build-infra':
+ specifier: workspace:5.5.0-alpha.11
+ version: file:packages/private-build-infra
+ '@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/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/edition-utils':
+ specifier: ^1.2.0
+ version: 1.2.0
+ '@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)
+ '@embroider/macros':
+ specifier: ^1.12.2
+ version: 1.13.1(@babel/core@7.23.0)
+ '@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
+ '@warp-drive/diagnostic':
+ specifier: workspace:5.5.0-alpha.11
+ version: file:packages/diagnostic
+ 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-blueprint-test-helpers:
+ specifier: ^0.19.2
+ version: 0.19.2
+ 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-cli-sri:
+ specifier: ^2.1.1
+ version: 2.1.1
+ ember-cli-terser:
+ specifier: ~4.0.2
+ version: 4.0.2
+ ember-cli-test-loader:
+ specifier: ^3.1.0
+ version: 3.1.0(@babel/core@7.23.0)
+ ember-disable-prototype-extensions:
+ specifier: ^1.1.3
+ version: 1.1.3
+ 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-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)
+ ember-source-channel-url:
+ specifier: ^3.0.0
+ version: 3.0.0
+ ember-try:
+ specifier: ^3.0.0
+ version: 3.0.0
+ loader.js:
+ specifier: ^4.7.0
+ version: 4.7.0
+ silent-error:
+ specifier: ^1.1.1
+ version: 1.1.1
+ webpack:
+ specifier: ^5.88.2
+ version: 5.88.2
+ dependenciesMeta:
+ '@ember-data/graph':
+ injected: true
+ '@ember-data/json-api':
+ injected: true
+ '@ember-data/legacy-compat':
+ injected: true
+ '@ember-data/model':
+ injected: true
+ '@ember-data/private-build-infra':
+ injected: true
+ '@ember-data/request':
+ injected: true
+ '@ember-data/request-utils':
+ injected: true
+ '@ember-data/store':
+ injected: true
+ '@ember-data/tracking':
+ injected: true
+ '@ember-data/unpublished-test-infra':
+ injected: true
+ '@warp-drive/diagnostic':
+ injected: true
+
tests/ember-data__model:
devDependencies:
'@babel/core':
@@ -2576,158 +2728,6 @@ importers:
ember-data:
injected: true
- tests/graph:
- devDependencies:
- '@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/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/private-build-infra':
- specifier: workspace:5.5.0-alpha.11
- version: file:packages/private-build-infra
- '@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/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/edition-utils':
- specifier: ^1.2.0
- version: 1.2.0
- '@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)
- '@embroider/macros':
- specifier: ^1.12.2
- version: 1.13.1(@babel/core@7.23.0)
- '@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
- '@warp-drive/diagnostic':
- specifier: workspace:5.5.0-alpha.11
- version: file:packages/diagnostic
- 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-blueprint-test-helpers:
- specifier: ^0.19.2
- version: 0.19.2
- 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-cli-sri:
- specifier: ^2.1.1
- version: 2.1.1
- ember-cli-terser:
- specifier: ~4.0.2
- version: 4.0.2
- ember-cli-test-loader:
- specifier: ^3.1.0
- version: 3.1.0(@babel/core@7.23.0)
- ember-disable-prototype-extensions:
- specifier: ^1.1.3
- version: 1.1.3
- 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-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)
- ember-source-channel-url:
- specifier: ^3.0.0
- version: 3.0.0
- ember-try:
- specifier: ^3.0.0
- version: 3.0.0
- loader.js:
- specifier: ^4.7.0
- version: 4.7.0
- silent-error:
- specifier: ^1.1.1
- version: 1.1.1
- webpack:
- specifier: ^5.88.2
- version: 5.88.2
- dependenciesMeta:
- '@ember-data/graph':
- injected: true
- '@ember-data/json-api':
- injected: true
- '@ember-data/legacy-compat':
- injected: true
- '@ember-data/model':
- injected: true
- '@ember-data/private-build-infra':
- injected: true
- '@ember-data/request':
- injected: true
- '@ember-data/request-utils':
- injected: true
- '@ember-data/store':
- injected: true
- '@ember-data/tracking':
- injected: true
- '@ember-data/unpublished-test-infra':
- injected: true
- '@warp-drive/diagnostic':
- injected: true
-
tests/json-api:
devDependencies:
'@babel/core':
diff --git a/tests/ember-data__graph/README.md b/tests/ember-data__graph/README.md
new file mode 100644
index 00000000000..82b06f0ca94
--- /dev/null
+++ b/tests/ember-data__graph/README.md
@@ -0,0 +1,12 @@
+# Tests for @ember-data/graph
+
+This test-package provides tests for the `@ember-data/graph` 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__graph;
+pnpm test;
+```
diff --git a/tests/graph/app/app.ts b/tests/ember-data__graph/app/app.ts
similarity index 100%
rename from tests/graph/app/app.ts
rename to tests/ember-data__graph/app/app.ts
diff --git a/tests/graph/app/config/environment.d.ts b/tests/ember-data__graph/app/config/environment.d.ts
similarity index 100%
rename from tests/graph/app/config/environment.d.ts
rename to tests/ember-data__graph/app/config/environment.d.ts
diff --git a/tests/graph/app/index.html b/tests/ember-data__graph/app/index.html
similarity index 73%
rename from tests/graph/app/index.html
rename to tests/ember-data__graph/app/index.html
index 1cb66ddd05c..99697296d7b 100644
--- a/tests/graph/app/index.html
+++ b/tests/ember-data__graph/app/index.html
@@ -3,14 +3,14 @@
- EmberData Graph Test App
+ @ember-data/graph Tests
{{content-for "head"}}
-
+
{{content-for "head-footer"}}
@@ -18,7 +18,7 @@
{{content-for "body"}}
-
+
{{content-for "body-footer"}}
diff --git a/tests/graph/app/resolver.ts b/tests/ember-data__graph/app/resolver.ts
similarity index 100%
rename from tests/graph/app/resolver.ts
rename to tests/ember-data__graph/app/resolver.ts
diff --git a/tests/graph/app/router.ts b/tests/ember-data__graph/app/router.ts
similarity index 100%
rename from tests/graph/app/router.ts
rename to tests/ember-data__graph/app/router.ts
diff --git a/tests/graph/app/services/store.ts b/tests/ember-data__graph/app/services/store.ts
similarity index 100%
rename from tests/graph/app/services/store.ts
rename to tests/ember-data__graph/app/services/store.ts
diff --git a/tests/graph/app/styles/app.css b/tests/ember-data__graph/app/styles/app.css
similarity index 100%
rename from tests/graph/app/styles/app.css
rename to tests/ember-data__graph/app/styles/app.css
diff --git a/tests/graph/app/templates/.gitkeep b/tests/ember-data__graph/app/templates/.gitkeep
similarity index 100%
rename from tests/graph/app/templates/.gitkeep
rename to tests/ember-data__graph/app/templates/.gitkeep
diff --git a/tests/graph/app/templates/application.hbs b/tests/ember-data__graph/app/templates/application.hbs
similarity index 100%
rename from tests/graph/app/templates/application.hbs
rename to tests/ember-data__graph/app/templates/application.hbs
diff --git a/tests/graph/config/environment.js b/tests/ember-data__graph/config/environment.js
similarity index 96%
rename from tests/graph/config/environment.js
rename to tests/ember-data__graph/config/environment.js
index e8b79acbef5..d9e0a92ad97 100644
--- a/tests/graph/config/environment.js
+++ b/tests/ember-data__graph/config/environment.js
@@ -2,7 +2,7 @@
module.exports = function (environment) {
let ENV = {
- modulePrefix: 'graph-test-app',
+ modulePrefix: 'ember-data__graph',
environment,
rootURL: '/',
locationType: 'history',
diff --git a/tests/graph/config/optional-features.json b/tests/ember-data__graph/config/optional-features.json
similarity index 100%
rename from tests/graph/config/optional-features.json
rename to tests/ember-data__graph/config/optional-features.json
diff --git a/tests/graph/config/targets.js b/tests/ember-data__graph/config/targets.js
similarity index 100%
rename from tests/graph/config/targets.js
rename to tests/ember-data__graph/config/targets.js
diff --git a/tests/graph/ember-cli-build.js b/tests/ember-data__graph/ember-cli-build.js
similarity index 100%
rename from tests/graph/ember-cli-build.js
rename to tests/ember-data__graph/ember-cli-build.js
diff --git a/tests/graph/package.json b/tests/ember-data__graph/package.json
similarity index 97%
rename from tests/graph/package.json
rename to tests/ember-data__graph/package.json
index 1eda5756ab6..26ac9f2ac16 100644
--- a/tests/graph/package.json
+++ b/tests/ember-data__graph/package.json
@@ -1,5 +1,5 @@
{
- "name": "graph-test-app",
+ "name": "ember-data__graph",
"version": "5.5.0-alpha.11",
"private": true,
"description": "Provides tests for @ember-data/graph",
@@ -7,7 +7,7 @@
"repository": {
"type": "git",
"url": "git+ssh://git@github.com:emberjs/data.git",
- "directory": "tests/graph"
+ "directory": "tests/ember-data__graph"
},
"license": "MIT",
"author": "",
diff --git a/tests/graph/testem.js b/tests/ember-data__graph/testem.js
similarity index 100%
rename from tests/graph/testem.js
rename to tests/ember-data__graph/testem.js
diff --git a/tests/graph/tests/.gitkeep b/tests/ember-data__graph/tests/.gitkeep
similarity index 100%
rename from tests/graph/tests/.gitkeep
rename to tests/ember-data__graph/tests/.gitkeep
diff --git a/tests/graph/tests/index.html b/tests/ember-data__graph/tests/index.html
similarity index 91%
rename from tests/graph/tests/index.html
rename to tests/ember-data__graph/tests/index.html
index f8da8d7ae7f..6a52ee474b7 100644
--- a/tests/graph/tests/index.html
+++ b/tests/ember-data__graph/tests/index.html
@@ -3,7 +3,7 @@