test(tailwind): remove new fixture, make existing test passes

vercel · Sep 8, 2023 · b7c7bf5 · b7c7bf5
1 parent 0892aba
commit b7c7bf5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 89 deletions.
diff --git a/test/development/basic/tailwind-jit.test.ts b/test/development/basic/tailwind-jit.test.ts
@@ -2,7 +2,13 @@ import { join } from 'path'
 import webdriver from 'next-webdriver'
 import { createNext, FileRef } from 'e2e-utils'
 import { NextInstance } from 'test/lib/next-modes/base'
-import { check } from 'next-test-utils'
+import { check, shouldRunTurboDevTest } from 'next-test-utils'
+
+// [TODO]: It is unclear why turbopack takes longer to run this test
+// remove once it's fixed
+if (shouldRunTurboDevTest()) {
+  jest.setTimeout(1000 * 60 * 5)
+}
 
 describe('TailwindCSS JIT', () => {
   let next: NextInstance

diff --git a/test/e2e/basic-tailwind/index.test.ts b/test/e2e/basic-tailwind/index.test.ts
diff --git a/test/e2e/basic-tailwind/pages/_app.js b/test/e2e/basic-tailwind/pages/_app.js
diff --git a/test/e2e/basic-tailwind/pages/index.js b/test/e2e/basic-tailwind/pages/index.js
diff --git a/test/e2e/basic-tailwind/postcss.config.js b/test/e2e/basic-tailwind/postcss.config.js
diff --git a/test/e2e/basic-tailwind/styles/global.css b/test/e2e/basic-tailwind/styles/global.css
diff --git a/test/e2e/basic-tailwind/tailwind.config.js b/test/e2e/basic-tailwind/tailwind.config.js
diff --git a/test/turbopack-tests-manifest.js b/test/turbopack-tests-manifest.js
@@ -109,6 +109,7 @@ const enabledTests = [
   'test/e2e/typescript-version-no-warning/typescript-version-no-warning.test.ts',
   'test/e2e/typescript-version-warning/typescript-version-warning.test.ts',
   'test/e2e/undici-fetch/index.test.ts',
+<<<<<<< HEAD
   'test/integration/create-next-app/templates-app.test.ts',
   'test/integration/create-next-app/templates-pages.test.ts',
   'test/integration/custom-routes-i18n-index-redirect/test/index.test.js',
@@ -137,6 +138,12 @@ const enabledTests = [
   'test/production/jest/transpile-packages.test.ts',
   'test/production/postcss-plugin-config-as-string/index.test.ts',
   'test/production/suppo.ts',
+=======
+  'test/integration/bigint/test/index.test.js',
+  'test/e2e/styled-jsx/index.test.ts',
+  // TODO: re-enable once the logging is aligned
+  // 'test/integration/middleware-basic/test/index.test.js',
+>>>>>>> 9fa53f7891 (test(tailwind): remove new fixture, make existing test passes)
 ]
 
 module.exports = { enabledTests }