Merge pull request #238 from soxhub/prepare-for-proving-the-migration…

…-path Prepare for sharing tests between all the apps
soxhub · Jun 14, 2024 · bc32b08 · bc32b08
2 parents 5bd9470 + 7be1e97
commit bc32b08
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 72 deletions.
diff --git a/test-apps/classic-app/tests/helpers/index.js b/test-apps/classic-app/tests/helpers/index.js
diff --git a/...onents/from-v2-addon-ts/at-class-test.gjs → ...narios/from-v2-addon-ts/at-class-test.gjs b/...onents/from-v2-addon-ts/at-class-test.gjs → ...narios/from-v2-addon-ts/at-class-test.gjs
@@ -2,8 +2,8 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 import ComponentAtClass from 'v2-addon-ts/components/at-class-ts/component-at-class';
 
 import { scopedClass } from 'ember-scoped-css/test-support';

diff --git a/...ts/from-v2-addon-ts/strict-class-test.gjs → ...os/from-v2-addon-ts/strict-class-test.gjs b/...ts/from-v2-addon-ts/strict-class-test.gjs → ...os/from-v2-addon-ts/strict-class-test.gjs
@@ -1,7 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 import { StrictClass } from 'v2-addon-ts/components/strict-class';
 
 import { scopedClass } from 'ember-scoped-css/test-support';

diff --git a/...mponents/from-v2-addon-ts/strict-test.gjs → ...cenarios/from-v2-addon-ts/strict-test.gjs b/...mponents/from-v2-addon-ts/strict-test.gjs → ...cenarios/from-v2-addon-ts/strict-test.gjs
@@ -1,7 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 import { Strict } from 'v2-addon-ts/components/strict';
 
 import { scopedClass } from 'ember-scoped-css/test-support';

diff --git a/...addon-ts/v2-addon-ts-with-a-class-test.js → ...addon-ts/v2-addon-ts-with-a-class-test.js b/...addon-ts/v2-addon-ts-with-a-class-test.js → ...addon-ts/v2-addon-ts-with-a-class-test.js
@@ -1,8 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
-
-import { setupRenderingTest } from 'classic-app/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 

diff --git a/...from-v2-addon/alert-from-v2-addon-test.js → ...from-v2-addon/alert-from-v2-addon-test.js b/...from-v2-addon/alert-from-v2-addon-test.js → ...from-v2-addon/alert-from-v2-addon-test.js
@@ -1,8 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
-
-import { setupRenderingTest } from 'classic-app/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 

diff --git a/...omponents/from-v2-addon/at-class-test.gjs → ...scenarios/from-v2-addon/at-class-test.gjs b/...omponents/from-v2-addon/at-class-test.gjs → ...scenarios/from-v2-addon/at-class-test.gjs
@@ -2,8 +2,8 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 import ComponentAtClass from 'v2-addon/components/at-class/component-at-class';
 
 import { scopedClass } from 'ember-scoped-css/test-support';

diff --git a/...ation/components/in-app/at-class-test.gts → ...shared-scenarios/in-app/at-class-test.gts b/...ation/components/in-app/at-class-test.gts → ...shared-scenarios/in-app/at-class-test.gts
diff --git a/.../integration/components/at-class-test.gjs → ...narios/in-app/component-at-class-test.gjs b/.../integration/components/at-class-test.gjs → ...narios/in-app/component-at-class-test.gjs
@@ -1,14 +1,14 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
 import ComponentAtClass from 'classic-app/components/component-at-class';
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 
 
-module('Integration | Component | @class', function (hooks) {
+module('[In App] @class', function (hooks) {
   setupRenderingTest(hooks);
 
   test('strict mode', async function (assert) {

diff --git a/...tion/components/dynamic-attribute-test.js → ...cenarios/in-app/dynamic-attribute-test.js b/...tion/components/dynamic-attribute-test.js → ...cenarios/in-app/dynamic-attribute-test.js
@@ -2,10 +2,9 @@ import { tracked } from '@glimmer/tracking';
 import { render, settled } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
-
-module('Integration | Component | DynamicAttribute', function (hooks) {
+module('[In App] DynamicAttribute', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it has scoped class', async function (assert) {

diff --git a/...sts/integration/components/header-test.js → ...ts/shared-scenarios/in-app/header-test.js b/...sts/integration/components/header-test.js → ...ts/shared-scenarios/in-app/header-test.js
@@ -1,12 +1,11 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
-
-import { setupRenderingTest } from 'classic-app/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 
-module('Integration | Component | header', function (hooks) {
+module('[In App]  header', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it has scoped class', async function (assert) {

diff --git a/...egration/components/in-app/misuse-test.js → ...ts/shared-scenarios/in-app/misuse-test.js b/...egration/components/in-app/misuse-test.js → ...ts/shared-scenarios/in-app/misuse-test.js
@@ -1,8 +1,7 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, skip } from 'qunit';
-
-import { setupRenderingTest } from 'classic-app/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 
 module('[In App] Misuse', function (hooks) {
   setupRenderingTest(hooks);

diff --git a/...sts/integration/components/scoped-test.js → ...ts/shared-scenarios/in-app/scoped-test.js b/...sts/integration/components/scoped-test.js → ...ts/shared-scenarios/in-app/scoped-test.js
@@ -1,10 +1,9 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
-
-module('Integration | Component | scoped', function (hooks) {
+module('[In App] scoped', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it replaces the scoped-class helper', async function (assert) {

diff --git a/.../integration/components/show-time-test.js → ...shared-scenarios/in-app/show-time-test.js b/.../integration/components/show-time-test.js → ...shared-scenarios/in-app/show-time-test.js
@@ -1,10 +1,9 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
-import { setupRenderingTest } from 'classic-app/tests/helpers';
-
-module('Integration | Component | show-time', function (hooks) {
+module('[In App] show-time', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it has scoped class', async function (assert) {

diff --git a/...gration/components/subexpression-test.gjs → ...d-scenarios/in-app/subexpression-test.gjs b/...gration/components/subexpression-test.gjs → ...d-scenarios/in-app/subexpression-test.gjs
@@ -1,13 +1,13 @@
 import { render, settled } from '@ember/test-helpers';
 import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
 
 import SubExpression from 'classic-app/components/subexpression';
-import { setupRenderingTest } from 'classic-app/tests/helpers';
 import { cell } from 'ember-resources';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 
-module('Integration | Component | subexpression', function (hooks) {
+module('[In App] subexpression', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it has scoped class', async function (assert) {

diff --git a/...egration/components/template-only-test.js → ...ed-scenarios/in-app/template-only-test.js b/...egration/components/template-only-test.js → ...ed-scenarios/in-app/template-only-test.js
@@ -1,12 +1,11 @@
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { module, test } from 'qunit';
-
-import { setupRenderingTest } from 'classic-app/tests/helpers';
+import { setupRenderingTest } from 'ember-qunit';
 
 import { scopedClass } from 'ember-scoped-css/test-support';
 
-module('Integration | Component | template-only', function (hooks) {
+module('[In App] template-only', function (hooks) {
   setupRenderingTest(hooks);
 
   test('it has scoped class', async function (assert) {

diff --git a/test-apps/classic-app/tests/unit/.gitkeep b/test-apps/classic-app/tests/unit/.gitkeep
diff --git a/test-apps/pods-classic-app/tests/application/route-scoped-css-test.js b/test-apps/pods-classic-app/tests/application/route-scoped-css-test.js
@@ -1,7 +1,7 @@
 import { visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
-import { setupApplicationTest } from 'pods-classic-app/tests/helpers';
+import { setupApplicationTest } from 'ember-qunit';
 
 import { scopedClass } from 'ember-scoped-css/test-support';