test: restructure test dirs

.github/filters.yaml

@@ -6,7 +6,7 @@ backend:
   - 'packages/**/strapi-server.js'
   - 'packages/{utils,generators,cli,providers}/**'
   - 'packages/core/*/{lib,bin,ee}/**'
-  - 'api-tests/**'
+  - 'tests/api/**'
 frontend:
   - '.github/actions/yarn-nm-install/*.yml'
   - '.github/workflows/**'

.gitignore

@@ -145,8 +145,8 @@ front-workspace.code-workspace
 ############################
 playwright-report
 test-results
-!e2e/data/*.tar
-e2e/.env
+!tests/e2e/data/*.tar
+tests/e2e/.env
 
 ############################
 # Strapi

jest-preset.unit.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  setupFilesAfterEnv: [__dirname + '/test/setup/unit.setup.js'],
+  setupFilesAfterEnv: [__dirname + '/tests/setup/unit.setup.js'],
   modulePathIgnorePatterns: ['.cache', 'dist'],
   testPathIgnorePatterns: ['.testdata.js', '.test.utils.js', '.d.ts'],
   testMatch: ['**/__tests__/**/*.{js,ts,jsx,tsx}'],

jest.config.api.js

@@ -4,7 +4,7 @@ module.exports = {
   displayName: 'API integration tests',
   testMatch: ['**/?(*.)+(spec|test).api.(js|ts)'],
   testEnvironment: 'node',
-  setupFilesAfterEnv: ['<rootDir>/test/setup/jest-api.setup.js'],
+  setupFilesAfterEnv: ['<rootDir>/tests/setup/jest-api.setup.js'],
   coveragePathIgnorePatterns: [
     '<rootDir>/dist/',
     '<rootDir>/node_modules/',

package.json

@@ -47,11 +47,11 @@
     "prettier:other": "prettier --cache --cache-strategy content \"**/*.{md,mdx,css,scss,yaml,yml}\"",
     "prettier:write": "prettier --write \"**/*.{js,ts,jsx,tsx,json,md,mdx,css,scss,yaml,yml}\"",
     "setup": "yarn && yarn clean && yarn build --skip-nx-cache",
-    "test:api": "node test/scripts/run-api-tests.js",
+    "test:api": "node tests/scripts/run-api-tests.js",
     "test:clean": "rimraf ./coverage",
-    "test:e2e": "node test/scripts/run-e2e-tests.js",
-    "test:e2e:clean": "node test/scripts/run-e2e-tests.js clean",
-    "test:e2e:debug": "node test/scripts/run-e2e-tests.js --debug",
+    "test:e2e": "node tests/scripts/run-e2e-tests.js",
+    "test:e2e:clean": "node tests/scripts/run-e2e-tests.js clean",
+    "test:e2e:debug": "node tests/scripts/run-e2e-tests.js --debug",
     "test:front": "cross-env IS_EE=true jest --config jest.config.front.js",
     "test:front:all": "cross-env IS_EE=true nx run-many --target=test:front --nx-ignore-cycles",
     "test:front:all:ce": "cross-env IS_EE=false nx run-many --target=test:front:ce --nx-ignore-cycles",
@@ -60,8 +60,8 @@
     "test:front:update:ce": "yarn test:front:ce -u",
     "test:front:watch": "cross-env IS_EE=true run test:front --watch",
     "test:front:watch:ce": "cross-env IS_EE=false run test:front --watch",
-    "test:generate-app": "yarn build:ts && node test/scripts/generate-test-app.js",
-    "test:generate-app:no-build": "node test/scripts/generate-test-app.js",
+    "test:generate-app": "yarn build:ts && node tests/scripts/generate-test-app.js",
+    "test:generate-app:no-build": "node tests/scripts/generate-test-app.js",
     "test:ts": "yarn test:ts:packages && yarn test:ts:front && yarn test:ts:back",
     "test:ts:back": "nx run-many --target=test:ts:back --nx-ignore-cycles",
     "test:ts:front": "nx run-many --target=test:ts:front --nx-ignore-cycles",

packages/core/admin/server/src/controllers/__tests__/api-token.test.ts

@@ -2,7 +2,7 @@ import { errors } from '@strapi/utils';
 import { omit } from 'lodash/fp';
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import constants from '../../services/constants';
 import apiTokenController from '../api-token';
 

packages/core/admin/server/src/controllers/__tests__/content-api.test.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import contentApiController from '../content-api';
 
 describe('Content API permissions', () => {

packages/core/admin/server/src/controllers/__tests__/permission.test.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import permissionController from '../permission';
 
 describe('Permission Controller', () => {

packages/core/admin/server/src/controllers/__tests__/role.test.ts

@@ -1,7 +1,7 @@
 import { errors } from '@strapi/utils';
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import roleController from '../role';
 
 describe('Role controller', () => {

packages/core/admin/server/src/controllers/__tests__/transfer/token.test.ts

@@ -2,7 +2,7 @@ import { errors } from '@strapi/utils';
 import { omit } from 'lodash/fp';
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../../tests/helpers/create-context';
 import constants from '../../../services/constants';
 import transferTokenController from '../../transfer/token';
 

packages/core/admin/server/src/controllers/__tests__/user.test.ts

@@ -1,7 +1,7 @@
 import { errors } from '@strapi/utils';
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import userController from '../user';
 
 describe('User Controller', () => {

packages/core/admin/server/src/strategies/__tests__/admin.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/no-relative-packages */
 // @ts-expect-error - test purposes
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import adminAuthStrategy from '../admin';
 
 describe('Admin Auth Strategy', () => {

packages/core/admin/server/src/strategies/__tests__/api-token.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-relative-packages */
 import { errors } from '@strapi/utils';
 // @ts-expect-error - test purposes
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import apiTokenStrategy from '../api-token';
 
 describe('API Token Auth Strategy', () => {

packages/core/content-manager/server/src/controllers/__tests__/content-types.test.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import contentTypes from '../content-types';
 
 describe('Content Types', () => {

packages/core/content-manager/server/src/controllers/__tests__/relations.test.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import relations from '../relations';
 
 const contentTypes = {

packages/core/content-manager/server/src/controllers/__tests__/single-types.test.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - types are not generated for this file
 // eslint-disable-next-line import/no-relative-packages
-import createContext from '../../../../../../../test/helpers/create-context';
+import createContext from '../../../../../../../tests/helpers/create-context';
 import singleTypes from '../single-types';
 import populateBuilder from '../../services/populate-builder';
 

packages/core/strapi/src/services/metrics/__tests__/admin-user-hash.test.ts

@@ -1,6 +1,7 @@
 import crypto from 'crypto';
+// eslint-disable-next-line import/no-relative-packages
+import createContext from '../../../../../../../tests/helpers/create-context';
 import { generateAdminUserHash } from '../admin-user-hash';
-import createContext from '../../../../../../../test/helpers/create-context';
 
 describe('user email hash', () => {
   test('should create a hash from admin user email', () => {

api-tests/core/admin/admin-api-token-crud.test.api.ts → tests/api/core/admin/admin-api-token-crud.test.api.ts

@@ -3,7 +3,7 @@
 import { omit } from 'lodash';
 import { createStrapiInstance } from 'api-tests/strapi';
 import { createAuthRequest } from 'api-tests/request';
-import constants from '../../../packages/core/admin/server/src/services/constants';
+import constants from '../../../../packages/core/admin/server/src/services/constants';
 
 describe('Admin API Token v2 CRUD (api)', () => {
   let rq;

api-tests/core/admin/admin-transfer-token-crud.test.api.ts → tests/api/core/admin/admin-transfer-token-crud.test.api.ts

@@ -1,7 +1,7 @@
 import { omit } from 'lodash';
 import { createStrapiInstance } from 'api-tests/strapi';
 import { createAuthRequest } from 'api-tests/request';
-import constants from '../../../packages/core/admin/server/src/services/constants';
+import constants from '../../../../packages/core/admin/server/src/services/constants';
 
 describe('Admin Transfer Token CRUD (api)', () => {
   let rq;

api-tests/core/admin/ee/review-workflows-content-types.test.api.ts → tests/api/core/admin/ee/review-workflows-content-types.test.api.ts

@@ -8,7 +8,7 @@ import { describeOnCondition } from 'api-tests/utils';
 import {
   WORKFLOW_MODEL_UID,
   ENTITY_STAGE_ATTRIBUTE,
-} from '../../../../packages/core/admin/ee/server/src/constants/workflows';
+} from '../../../../../packages/core/admin/ee/server/src/constants/workflows';
 
 const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
 

api-tests/core/admin/ee/review-workflows.test.api.ts → tests/api/core/admin/ee/review-workflows.test.api.ts

@@ -13,7 +13,7 @@ import {
   WORKFLOW_MODEL_UID,
   ENTITY_STAGE_ATTRIBUTE,
   ENTITY_ASSIGNEE_ATTRIBUTE,
-} from '../../../../packages/core/admin/ee/server/src/constants/workflows';
+} from '../../../../../packages/core/admin/ee/server/src/constants/workflows';
 
 const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
 

api-tests/core/upload/admin/configure-view.test.api.js → tests/api/core/upload/admin/configure-view.test.api.js

@@ -6,7 +6,7 @@ const { createStrapiInstance } = require('api-tests/strapi');
 const { createAuthRequest } = require('api-tests/request');
 const { createUtils } = require('api-tests/utils');
 
-const { ALLOWED_SORT_STRINGS } = require('../../../../packages/core/upload/server/constants');
+const { ALLOWED_SORT_STRINGS } = require('../../../../../packages/core/upload/server/constants');
 
 const builder = createTestBuilder();
 let strapi;

api-tests/core/upload/admin/file-size-limit.test.api.js → tests/api/core/upload/admin/file-size-limit.test.api.js

@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const _ = require('lodash/fp');
 
-jest.mock('../../../../packages/core/upload/server/config', () => {
-  const config = jest.requireActual('../../../../packages/core/upload/server/config');
+jest.mock('../../../../../packages/core/upload/server/config', () => {
+  const config = jest.requireActual('../../../../../packages/core/upload/server/config');
   return _.set('default.sizeLimit', 1000, config); // 1kb
 });
 

e2e/scripts/dts-import.js → tests/e2e/scripts/dts-import.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path';
+import { resolve, join } from 'path';
 import { ALLOWED_CONTENT_TYPES, CUSTOM_TRANSFER_TOKEN_ACCESS_KEY } from '../constants';
 
 const {
@@ -17,7 +17,8 @@ const {
  * see: https://docs.strapi.io/developer-docs/latest/developer-resources/data-management.html
  * @param {String} filePath the path to a DTS backup
  */
-export const resetDatabaseAndImportDataFromPath = async (filePath) => {
+export const resetDatabaseAndImportDataFromPath = async (file) => {
+  const filePath = join('./tests/e2e/data/', file);
   const source = createSourceProvider(filePath);
   const destination = createDestinationProvider();
 

e2e/tests/admin/login.spec.js → tests/e2e/tests/admin/login.spec.js

@@ -6,7 +6,7 @@ import { login } from '../../utils/login';
 
 test.describe('Login', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
   });
 

e2e/tests/admin/logout.spec.js → tests/e2e/tests/admin/logout.spec.js

@@ -5,7 +5,7 @@ import { login } from '../../utils/login';
 
 test.describe('Log Out', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

e2e/tests/admin/signup.spec.js → tests/e2e/tests/admin/signup.spec.js

@@ -25,7 +25,7 @@ export const fillValidSignUpForm = async ({ page }) => {
 
 test.describe('Sign Up', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/without-admin.tar');
+    await resetDatabaseAndImportDataFromPath('without-admin.tar');
     await page.goto('/admin');
     await fillValidSignUpForm({ page });
   });

e2e/tests/admin/transfer/tokens.spec.ts → tests/e2e/tests/admin/transfer/tokens.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { login } from '../../../utils/login';
 import { resetDatabaseAndImportDataFromPath } from '../../../scripts/dts-import';
-import { navToHeader, delay } from '../../../utils/shared';
+import { navToHeader } from '../../../utils/shared';
 
 const createTransferToken = async (page, tokenName, duration, type) => {
   await navToHeader(
@@ -27,7 +27,7 @@ const createTransferToken = async (page, tokenName, duration, type) => {
 
 test.describe('Transfer Tokens', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

e2e/tests/content-manager/editview.spec.ts → tests/e2e/tests/content-manager/editview.spec.ts

@@ -5,7 +5,7 @@ import { findAndClose } from '../../utils/shared';
 
 test.describe('Edit View', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

e2e/tests/content-manager/listview.spec.ts → tests/e2e/tests/content-manager/listview.spec.ts

@@ -7,7 +7,7 @@ import { resetDatabaseAndImportDataFromPath } from '../../scripts/dts-import';
 
 test.describe('List View', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

e2e/tests/content-releases/release-details-page.spec.ts → tests/e2e/tests/content-releases/release-details-page.spec.ts

@@ -29,7 +29,7 @@ const addEntryToRelease = async ({ page, releaseName }: { page: Page; releaseNam
 
 describeOnCondition(edition === 'EE')('Release page', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
 

e2e/tests/content-releases/releases-page.spec.ts → tests/e2e/tests/content-releases/releases-page.spec.ts

@@ -7,7 +7,7 @@ const edition = process.env.STRAPI_DISABLE_EE === 'true' ? 'CE' : 'EE';
 
 describeOnCondition(edition === 'EE')('Releases page', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

e2e/tests/content-type-builder/ctb-edit-view.spec.ts → tests/e2e/tests/content-type-builder/ctb-edit-view.spec.ts

@@ -5,7 +5,7 @@ import { resetDatabaseAndImportDataFromPath } from '../../scripts/dts-import';
 
 test.describe('Edit View CTB', () => {
   test.beforeEach(async ({ page }) => {
-    await resetDatabaseAndImportDataFromPath('./e2e/data/with-admin.tar');
+    await resetDatabaseAndImportDataFromPath('with-admin.tar');
     await page.goto('/admin');
     await login({ page });
   });

test/helpers/test-app.js → tests/helpers/test-app.js

@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const rimraf = require('rimraf');
 const execa = require('execa');
-const generateNew = require('../../packages/generators/app/dist/generate-new');
+const generateNew = require('@strapi/generate-new/dist/generate-new');
 
 /**
  * Deletes a test app

test/scripts/run-e2e-tests.js → tests/scripts/run-e2e-tests.js

@@ -12,7 +12,8 @@ const { createConfig } = require('../../playwright.base.config');
 
 const cwd = path.resolve(__dirname, '../..');
 const testAppDirectory = path.join(cwd, 'test-apps', 'e2e');
-const testRoot = path.join(cwd, 'e2e');
+const testRoot = path.join(cwd, 'tests', 'e2e');
+const testDomainRoot = path.join(testRoot, 'tests');
 const templateDir = path.join(testRoot, 'app-template');
 
 const pathExists = async (path) => {
@@ -67,7 +68,7 @@ yargs
     command: '*',
     description: 'run the E2E test suite',
     builder: async (yarg) => {
-      const domains = await fs.readdir(path.join(cwd, 'e2e', 'tests'));
+      const domains = await fs.readdir(testDomainRoot);
 
       yarg.option('concurrency', {
         alias: 'c',
@@ -154,7 +155,7 @@ yargs
                   },
                   useNullAsDefault: true,
                 },
-                template: path.join(cwd, 'e2e', 'app-template'),
+                template: path.join(testRoot, 'app-template'),
                 link: true,
               });
 
@@ -200,7 +201,7 @@ yargs
               );
 
               const config = createConfig({
-                testDir: path.join(cwd, 'e2e', 'tests', domain),
+                testDir: path.join(testDomainRoot, domain),
                 port,
                 appDir: testAppPath,
               });