Move tests inline (#304)

* move tests inline

* remove other references to __tests__

Author: nicknisi

jest.config.ts

@@ -26,7 +26,7 @@ const config: Config = {
     {
       displayName: 'jsdom',
       testEnvironment: 'jsdom',
-      testMatch: ['**/__tests__/**/*.spec.tsx'],
+      testMatch: ['**/src/**/*.spec.tsx'],
       transform: {
         '^.+\\.tsx?$': 'ts-jest', // Use ts-jest for TypeScript files
       },
@@ -37,7 +37,7 @@ const config: Config = {
     {
       displayName: 'node',
       testEnvironment: 'node',
-      testMatch: ['**/__tests__/**/*.spec.ts'],
+      testMatch: ['**/src/**/*.spec.ts'],
       transform: {
         '^.+\\.tsx?$': 'ts-jest',
       },

package.json

@@ -30,8 +30,9 @@
     "lint": "eslint \"src/**/*.ts*\"",
     "test": "jest",
     "test:watch": "jest --watch",
-    "prettier": "prettier \"{src,__tests__}/**/*.{js,ts,tsx}\" --check",
-    "format": "prettier \"{src,__tests__}/**/*.{js,ts,tsx}\" --write"
+    "prettier": "prettier \"src/**/*.{js,ts,tsx}\" --check",
+    "format": "prettier \"src/**/*.{js,ts,tsx}\" --write",
+    "type-check": "tsc --project tsconfig.json --noEmit"
   },
   "dependencies": {
     "@workos-inc/node": "^7.67.0",

__tests__/actions.spec.ts src/actions.spec.ts__tests__/actions.spec.ts renamed to src/actions.spec.ts

@@ -8,7 +8,7 @@ import {
   getAccessTokenAction,
   refreshAccessTokenAction,
 } from '../src/actions.js';
-import { signOut, switchToOrganization } from '../src/auth.js';
+import { signOut, switchToOrganization } from './auth.js';
 import { getWorkOS } from '../src/workos.js';
 import { withAuth, refreshSession } from '../src/session.js';
 

__tests__/auth.spec.ts src/auth.spec.ts__tests__/auth.spec.ts renamed to src/auth.spec.ts

@@ -1,16 +1,16 @@
 import { describe, it, expect, beforeEach, jest } from '@jest/globals';
 
-import { getSignInUrl, getSignUpUrl, signOut, switchToOrganization } from '../src/auth.js';
-import * as session from '../src/session.js';
+import { getSignInUrl, getSignUpUrl, signOut, switchToOrganization } from './auth.js';
+import * as session from './session.js';
 import * as cache from 'next/cache';
-import * as workosModule from '../src/workos.js';
+import * as workosModule from './workos.js';
 
 // These are mocked in jest.setup.ts
 import { cookies, headers } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { generateSession, generateTestToken } from './test-helpers.js';
 import { sealData } from 'iron-session';
-import { getWorkOS } from '../src/workos.js';
+import { getWorkOS } from './workos.js';
 
 const workos = getWorkOS();
 

__tests__/authkit-callback-route.spec.ts src/authkit-callback-route.spec.ts__tests__/authkit-callback-route.spec.ts renamed to src/authkit-callback-route.spec.ts

@@ -1,5 +1,5 @@
-import { getWorkOS } from '../src/workos.js';
-import { handleAuth } from '../src/authkit-callback-route.js';
+import { getWorkOS } from './workos.js';
+import { handleAuth } from './authkit-callback-route.js';
 import { NextRequest, NextResponse } from 'next/server';
 
 // Mocked in jest.setup.ts
@@ -119,7 +119,7 @@ describe('authkit-callback-route', () => {
       request.nextUrl.searchParams.set('code', 'invalid-code');
 
       const handler = handleAuth({
-        onError: ({ error }) => {
+        onError: () => {
           return new Response(JSON.stringify({ error: { message: 'Custom error' } }), {
             status: 500,
             headers: { 'Content-Type': 'application/json' },

__tests__/authkit-provider.spec.tsx src/components/authkit-provider.spec.tsx__tests__/authkit-provider.spec.tsx renamed to src/components/authkit-provider.spec.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
 import { render, waitFor, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { AuthKitProvider, useAuth } from '../src/components/authkit-provider.js';
+import { AuthKitProvider, useAuth } from './authkit-provider.js';
 import {
   checkSessionAction,
   getAuthAction,
   refreshAuthAction,
   handleSignOutAction,
   switchToOrganizationAction,
-} from '../src/actions.js';
+} from '../actions.js';
 
-jest.mock('../src/actions', () => ({
+jest.mock('../actions', () => ({
   checkSessionAction: jest.fn(),
   getAuthAction: jest.fn(),
   refreshAuthAction: jest.fn(),

__tests__/button.spec.tsx src/components/button.spec.tsx__tests__/button.spec.tsx renamed to src/components/button.spec.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { Button } from '../src/components/button.js';
+import { Button } from './button.js';
 
 describe('Button', () => {
   it('should render with default props', () => {

__tests__/impersonation.spec.tsx src/components/impersonation.spec.tsx__tests__/impersonation.spec.tsx renamed to src/components/impersonation.spec.tsx

@@ -1,18 +1,18 @@
 import { render, act, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { Impersonation } from '../src/components/impersonation.js';
-import { useAuth } from '../src/components/authkit-provider.js';
-import { getOrganizationAction } from '../src/actions.js';
+import { Impersonation } from './impersonation.js';
+import { useAuth } from './authkit-provider.js';
+import { getOrganizationAction } from '../actions.js';
 import * as React from 'react';
-import { handleSignOutAction } from '../src/actions.js';
+import { handleSignOutAction } from '../actions.js';
 
 // Mock the useAuth hook
-jest.mock('../src/components/authkit-provider', () => ({
+jest.mock('./authkit-provider', () => ({
   useAuth: jest.fn(),
 }));
 
 // Mock the getOrganizationAction
-jest.mock('../src/actions', () => ({
+jest.mock('../actions', () => ({
   getOrganizationAction: jest.fn(),
   handleSignOutAction: jest.fn(),
 }));

__tests__/min-max-button.spec.tsx src/components/min-max-button.spec.tsx__tests__/min-max-button.spec.tsx renamed to src/components/min-max-button.spec.tsx

@@ -1,5 +1,5 @@
 import { render, act } from '@testing-library/react';
-import { MinMaxButton } from '../src/components/min-max-button.js';
+import { MinMaxButton } from './min-max-button.js';
 import * as React from 'react';
 import '@testing-library/jest-dom';
 

__tests__/tokenStore.spec.ts src/components/tokenStore.spec.ts__tests__/tokenStore.spec.ts renamed to src/components/tokenStore.spec.ts

@@ -1,7 +1,7 @@
-import { tokenStore, TokenStore } from '../src/components/tokenStore.js';
-import { getAccessTokenAction, refreshAccessTokenAction } from '../src/actions.js';
+import { tokenStore, TokenStore } from './tokenStore.js';
+import { getAccessTokenAction, refreshAccessTokenAction } from '../actions.js';
 
-jest.mock('../src/actions.js', () => ({
+jest.mock('../actions.js', () => ({
   getAccessTokenAction: jest.fn(),
   refreshAccessTokenAction: jest.fn(),
 }));