remove duplication of tests between client/server sub-folders

coralproject · Jul 18, 2023 · 1a63f54 · 1a63f54
1 parent 840fdc8
commit 1a63f54
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 326 deletions.
diff --git a/client/config/jest.cache.config.js b/client/config/jest.cache.config.js
diff --git a/client/config/jest.config.js b/client/config/jest.config.js
@@ -1,6 +1,3 @@
 module.exports = {
-  projects: [
-    "<rootDir>/jest/client.config.js",
-    "<rootDir>/jest/server.config.js",
-  ],
+  projects: ["<rootDir>/jest/client.config.js"],
 };
diff --git a/client/config/jest.server.config.js b/client/config/jest.server.config.js
diff --git a/client/config/paths.cache.ts b/client/config/paths.cache.ts
diff --git a/client/config/paths.server.ts b/client/config/paths.server.ts
diff --git a/client/graphql.config.yml b/client/graphql.config.yml
@@ -1,10 +1,10 @@
 projects:
   tenant:
     schema:
-      - './src/core/server/graph/schema/schema.graphql'
+      - '../server/src/core/server/graph/schema/schema.graphql'
   stream:
     schema:
-      - './src/core/server/graph/schema/schema.graphql'
+      - '../server/src/core/server/graph/schema/schema.graphql'
       - './src/core/client/framework/lib/relay/local.graphql'
       - './src/core/client/stream/local/local.graphql'
       - './relay-compiler-directives-v10.0.1.graphql'
@@ -16,7 +16,7 @@ projects:
         useSchemaFileDefinitions: true
   admin:
     schema:
-      - './src/core/server/graph/schema/schema.graphql'
+      - '../server/src/core/server/graph/schema/schema.graphql'
       - './src/core/client/framework/lib/relay/local.graphql'
       - './src/core/client/admin/local/local.graphql'
       - './relay-compiler-directives-v10.0.1.graphql'
@@ -28,7 +28,7 @@ projects:
         useSchemaFileDefinitions: true
   auth:
     schema:
-      - './src/core/server/graph/schema/schema.graphql'
+      - '../server/src/core/server/graph/schema/schema.graphql'
       - './src/core/client/framework/lib/relay/local.graphql'
       - './src/core/client/auth/local/local.graphql'
       - './relay-compiler-directives-v10.0.1.graphql'

diff --git a/client/scripts/test.cache.js b/client/scripts/test.cache.js
diff --git a/client/scripts/testServer.js b/client/scripts/testServer.js
diff --git a/server/config/jest.client.admin.config.js b/server/config/jest.client.admin.config.js
diff --git a/server/config/jest.client.config.js b/server/config/jest.client.config.js
diff --git a/server/config/jest.client.other.config.js b/server/config/jest.client.other.config.js
diff --git a/server/config/jest.client.stream.config.js b/server/config/jest.client.stream.config.js
diff --git a/server/config/jest.config.js b/server/config/jest.config.js
@@ -1,6 +1,3 @@
 module.exports = {
-  projects: [
-    "<rootDir>/jest/client.config.js",
-    "<rootDir>/jest/server.config.js",
-  ],
+  projects: ["<rootDir>/jest/server.config.js"],
 };
diff --git a/server/config/paths.client.admin.ts b/server/config/paths.client.admin.ts
diff --git a/server/config/paths.client.other.ts b/server/config/paths.client.other.ts
diff --git a/server/config/paths.client.stream.ts b/server/config/paths.client.stream.ts
diff --git a/server/config/paths.client.ts b/server/config/paths.client.ts
diff --git a/server/graphql.config.yml b/server/graphql.config.yml
@@ -2,39 +2,3 @@ projects:
   tenant:
     schema:
       - './src/core/server/graph/schema/schema.graphql'
-  stream:
-    schema:
-      - './src/core/server/graph/schema/schema.graphql'
-      - './src/core/client/framework/lib/relay/local.graphql'
-      - './src/core/client/stream/local/local.graphql'
-      - './relay-compiler-directives-v10.0.1.graphql'
-    documents:
-      - './src/core/client/stream/**/*.ts'
-      - './src/core/client/stream/**/*.tsx'
-    extensions:
-      languageService:
-        useSchemaFileDefinitions: true
-  admin:
-    schema:
-      - './src/core/server/graph/schema/schema.graphql'
-      - './src/core/client/framework/lib/relay/local.graphql'
-      - './src/core/client/admin/local/local.graphql'
-      - './relay-compiler-directives-v10.0.1.graphql'
-    documents:
-      - './src/core/client/admin/**/*.ts'
-      - './src/core/client/admin/**/*.tsx'
-    extensions:
-      languageService:
-        useSchemaFileDefinitions: true
-  auth:
-    schema:
-      - './src/core/server/graph/schema/schema.graphql'
-      - './src/core/client/framework/lib/relay/local.graphql'
-      - './src/core/client/auth/local/local.graphql'
-      - './relay-compiler-directives-v10.0.1.graphql'
-    documents:
-      - './src/core/client/auth/**/*.ts'
-      - './src/core/client/auth/**/*.tsx'
-    extensions:
-      languageService:
-        useSchemaFileDefinitions: true
diff --git a/server/package.json b/server/package.json
@@ -51,9 +51,6 @@
     "start": "NODE_ENV=production node dist/index.js",
     "test": "node --trace-warnings scripts/test.js --watch",
     "test:server": "node --trace-warnings scripts/testServer.js",
-    "test:client:stream": "node --trace-warnings scripts/testClient.stream.js",
-    "test:client:admin": "node --trace-warnings scripts/testClient.admin.js",
-    "test:client:other": "node --trace-warnings scripts/testClient.other.js",
     "test:cache": "node --trace-warnings scripts/test.cache.js --env=jsdom",
     "tscheck:client": "tsc --project ./src/core/client/tsconfig.json --noEmit",
     "tscheck:scripts": "tsc --project ./tsconfig.json --noEmit",

diff --git a/server/scripts/testClient.admin.js b/server/scripts/testClient.admin.js
diff --git a/server/scripts/testClient.other.js b/server/scripts/testClient.other.js
diff --git a/server/scripts/testClient.stream.js b/server/scripts/testClient.stream.js