Move tests into core

remix-run · Feb 11, 2021 · 08eca96 · 08eca96
1 parent f72ff8c
commit 08eca96
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 18 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,10 +1,5 @@
 module.exports = {
   projects: [
-    {
-      displayName: "architect",
-      testEnvironment: "node",
-      testMatch: ["<rootDir>/packages/architect/**/*-test.[jt]s?(x)"]
-    },
     {
       displayName: "cli",
       testEnvironment: "node",
@@ -15,21 +10,11 @@ module.exports = {
       testEnvironment: "node",
       testMatch: ["<rootDir>/packages/core/**/*-test.[jt]s?(x)"]
     },
-    {
-      displayName: "data",
-      testEnvironment: "node",
-      testMatch: ["<rootDir>/packages/data/**/*-test.[jt]s?(x)"]
-    },
     {
       displayName: "express",
       testEnvironment: "node",
       testMatch: ["<rootDir>/packages/express/**/*-test.[jt]s?(x)"]
     },
-    {
-      displayName: "vercel",
-      testEnvironment: "node",
-      testMatch: ["<rootDir>/packages/vercel/**/*-test.[jt]s?(x)"]
-    },
     {
       displayName: "gists-app",
       testEnvironment: "node",

diff --git a/packages/data/__tests__/index-test.ts → packages/core/__tests__/responses-test.ts b/packages/data/__tests__/index-test.ts → packages/core/__tests__/responses-test.ts
diff --git a/packages/core/data.ts b/packages/core/data.ts
@@ -2,7 +2,7 @@ import type { Params } from "react-router";
 
 import type { AppLoadContext, AppData, RouteModule } from "./buildModules";
 import { Request, Response, isResponseLike } from "./fetch";
-import { json } from "./responseHelpers";
+import { json } from "./responses";
 
 export async function loadRouteData(
   routeId: string,

diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -68,7 +68,7 @@ export type {
   PageLinkDescriptor
 } from "./links";
 
-export { json, redirect } from "./responseHelpers";
+export { json, redirect } from "./responses";
 
 export type { RouteManifest, DefineRoute, DefineRoutes } from "./routes";
 

diff --git a/packages/core/responseHelpers.ts → packages/core/responses.ts b/packages/core/responseHelpers.ts → packages/core/responses.ts
diff --git a/packages/core/server.ts b/packages/core/server.ts
@@ -17,7 +17,7 @@ import {
 import { Request, Response } from "./fetch";
 import { getDocumentHeaders } from "./headers";
 import { ConfigRouteMatch, matchRoutes } from "./match";
-import { json, jsonError } from "./responseHelpers";
+import { json, jsonError } from "./responses";
 
 /**
  * The main request handler for a Remix server. This handler runs in the context