Remove numbering from tests

Author: adamwathan

package.json

@@ -40,7 +40,7 @@
   },
   "jest": {
     "setupFilesAfterEnv": [
-      "<rootDir>/tests/customMatchers.js"
+      "<rootDir>/tests/_customMatchers.js"
     ]
   },
   "browserslist": [

tests/customMatchers.js renamed to tests/_customMatchers.js

@@ -14,7 +14,7 @@ function run(input, config = {}) {
 test('@apply', () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './10-apply.test.html')],
+    purge: [path.resolve(__dirname, './apply.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -136,7 +136,7 @@ test('@apply', () => {
 `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './10-apply.test.css')
+    let expectedPath = path.resolve(__dirname, './apply.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)
@@ -146,7 +146,7 @@ test('@apply', () => {
 test('@apply error with unknown utility', async () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './10-apply.test.html')],
+    purge: [path.resolve(__dirname, './apply.test.html')],
     corePlugins: { preflight: false },
     plugins: [],
   }
@@ -168,7 +168,7 @@ test('@apply error with unknown utility', async () => {
 test('@apply error with nested @screen', async () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './10-apply.test.html')],
+    purge: [path.resolve(__dirname, './apply.test.html')],
     corePlugins: { preflight: false },
     plugins: [],
   }
@@ -194,7 +194,7 @@ test('@apply error with nested @screen', async () => {
 test('@apply error with nested @anyatrulehere', async () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './10-apply.test.html')],
+    purge: [path.resolve(__dirname, './apply.test.html')],
     corePlugins: { preflight: false },
     plugins: [],
   }

tests/10-apply.test.css renamed to tests/apply.test.css

@@ -9,7 +9,7 @@ function run(input, config = {}) {
 
 test('arbitrary values', () => {
   let config = {
-    purge: [path.resolve(__dirname, './08-arbitrary-values.test.html')],
+    purge: [path.resolve(__dirname, './arbitrary-values.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -22,7 +22,7 @@ test('arbitrary values', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './08-arbitrary-values.test.css')
+    let expectedPath = path.resolve(__dirname, './arbitrary-values.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/10-apply.test.html renamed to tests/apply.test.html

@@ -9,7 +9,7 @@ function run(input, config = {}) {
 
 test('basic usage', () => {
   let config = {
-    purge: [path.resolve(__dirname, './01-basic-usage.test.html')],
+    purge: [path.resolve(__dirname, './basic-usage.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -22,7 +22,7 @@ test('basic usage', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './01-basic-usage.test.css')
+    let expectedPath = path.resolve(__dirname, './basic-usage.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/10-apply.test.js renamed to tests/apply.test.js

@@ -9,7 +9,7 @@ function run(input, config = {}) {
 
 test('collapse adjacent rules', () => {
   let config = {
-    purge: [path.resolve(__dirname, './09-collapse-adjacent-rules.test.html')],
+    purge: [path.resolve(__dirname, './collapse-adjacent-rules.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -47,7 +47,7 @@ test('collapse adjacent rules', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './09-collapse-adjacent-rules.test.css')
+    let expectedPath = path.resolve(__dirname, './collapse-adjacent-rules.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/08-arbitrary-values.test.css renamed to tests/arbitrary-values.test.css

@@ -18,13 +18,13 @@ const css = `
   @tailwind components;
   @tailwind utilities;
 `
-const expectedPath = path.resolve(__dirname, './13-custom-extractors.test.css')
+const expectedPath = path.resolve(__dirname, './custom-extractors.test.css')
 const expected = fs.readFileSync(expectedPath, 'utf8')
 
 test('defaultExtractor', () => {
   let config = {
     purge: {
-      content: [path.resolve(__dirname, './13-custom-extractors.test.html')],
+      content: [path.resolve(__dirname, './custom-extractors.test.html')],
       options: {
         defaultExtractor: customExtractor,
       },
@@ -42,7 +42,7 @@ test('defaultExtractor', () => {
 test('extractors array', () => {
   let config = {
     purge: {
-      content: [path.resolve(__dirname, './13-custom-extractors.test.html')],
+      content: [path.resolve(__dirname, './custom-extractors.test.html')],
       options: {
         extractors: [
           {

tests/08-arbitrary-values.test.html renamed to tests/arbitrary-values.test.html

@@ -10,7 +10,7 @@ function run(input, config = {}) {
 test('custom separator', () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './03-custom-separator.test.html')],
+    purge: [path.resolve(__dirname, './custom-separator.test.html')],
     separator: '_',
     corePlugins: {},
     theme: {},
@@ -20,7 +20,7 @@ test('custom separator', () => {
   let css = `@tailwind utilities`
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './03-custom-separator.test.css')
+    let expectedPath = path.resolve(__dirname, './custom-separator.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/08-arbitrary-values.test.js renamed to tests/arbitrary-values.test.js

@@ -9,7 +9,7 @@ function run(input, config = {}) {
 
 test('using @import instead of @tailwind', () => {
   let config = {
-    purge: [path.resolve(__dirname, './12-import-syntax.test.html')],
+    purge: [path.resolve(__dirname, './import-syntax.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [
@@ -30,7 +30,7 @@ test('using @import instead of @tailwind', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './12-import-syntax.test.css')
+    let expectedPath = path.resolve(__dirname, './import-syntax.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/01-basic-usage.test.css renamed to tests/basic-usage.test.css

@@ -11,7 +11,7 @@ test('important boolean', () => {
   let config = {
     important: true,
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './04-important-boolean.test.html')],
+    purge: [path.resolve(__dirname, './important-boolean.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [
@@ -62,7 +62,7 @@ test('important boolean', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './04-important-boolean.test.css')
+    let expectedPath = path.resolve(__dirname, './important-boolean.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/01-basic-usage.test.html renamed to tests/basic-usage.test.html

@@ -12,7 +12,7 @@ test('important modifier with prefix', () => {
     important: false,
     prefix: 'tw-',
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './15-important-modifier-prefix.test.html')],
+    purge: [path.resolve(__dirname, './important-modifier-prefix.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -25,7 +25,7 @@ test('important modifier with prefix', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './15-important-modifier-prefix.test.css')
+    let expectedPath = path.resolve(__dirname, './important-modifier-prefix.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/01-basic-usage.test.js renamed to tests/basic-usage.test.js

@@ -11,7 +11,7 @@ test('important modifier', () => {
   let config = {
     important: false,
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './14-important-modifier.test.html')],
+    purge: [path.resolve(__dirname, './important-modifier.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -24,7 +24,7 @@ test('important modifier', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './14-important-modifier.test.css')
+    let expectedPath = path.resolve(__dirname, './important-modifier.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/09-collapse-adjacent-rules.test.css renamed to tests/collapse-adjacent-rules.test.css

@@ -10,7 +10,7 @@ function run(input, config = {}) {
 test('it works', () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './00-kitchen-sink.test.html')],
+    purge: [path.resolve(__dirname, './kitchen-sink.test.html')],
     corePlugins: { preflight: false },
     theme: {
       extend: {
@@ -158,7 +158,7 @@ test('it works', () => {
 `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './00-kitchen-sink.test.css')
+    let expectedPath = path.resolve(__dirname, './kitchen-sink.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/09-collapse-adjacent-rules.test.html renamed to tests/collapse-adjacent-rules.test.html

@@ -11,7 +11,7 @@ function run(input, config = {}) {
 test('modify selectors', () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './06-modify-selectors.test.html')],
+    purge: [path.resolve(__dirname, './modify-selectors.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [
@@ -42,7 +42,7 @@ test('modify selectors', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './06-modify-selectors.test.css')
+    let expectedPath = path.resolve(__dirname, './modify-selectors.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/09-collapse-adjacent-rules.test.js renamed to tests/collapse-adjacent-rules.test.js

@@ -6,9 +6,11 @@ const path = require('path')
 function pluginThatMutatesRules() {
   return (root) => {
     root.walkRules((rule) => {
-      rule.nodes.filter(node => node.prop === 'background-image').forEach(node => {
-        node.value = 'url("./bar.png")'
-      })
+      rule.nodes
+        .filter((node) => node.prop === 'background-image')
+        .forEach((node) => {
+          node.value = 'url("./bar.png")'
+        })
 
       return rule
     })
@@ -21,19 +23,19 @@ function run(input, config = {}) {
 
 test.only('plugins mutating rules after tailwind doesnt break it', async () => {
   let config = {
-    purge: [path.resolve(__dirname, './11-mutable.test.html')],
+    purge: [path.resolve(__dirname, './mutable.test.html')],
     theme: {
       backgroundImage: {
-        'foo': 'url("./foo.png")',
-      }
+        foo: 'url("./foo.png")',
+      },
     },
     plugins: [],
   }
 
   let css = `@tailwind utilities;`
 
   function checkResult(result) {
-    let expectedPath = path.resolve(__dirname, './11-mutable.test.css')
+    let expectedPath = path.resolve(__dirname, './mutable.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)
@@ -45,7 +47,7 @@ test.only('plugins mutating rules after tailwind doesnt break it', async () => {
 
   // Outside of the context of tailwind jit more postcss plugins may operate on the AST:
   // In this case we have a plugin that mutates rules directly
-  await postcss([ pluginThatMutatesRules() ]).process(firstRun, { from: path.resolve(__filename) })
+  await postcss([pluginThatMutatesRules()]).process(firstRun, { from: path.resolve(__filename) })
 
   // Verify subsequent runs don't produce mutated rules
   let secondRun = await run(css, config)

tests/13-custom-extractors.test.css renamed to tests/custom-extractors.test.css

@@ -11,7 +11,7 @@ test('prefix', () => {
   let config = {
     prefix: 'tw-',
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './05-prefix.test.html')],
+    purge: [path.resolve(__dirname, './prefix.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [
@@ -63,7 +63,7 @@ test('prefix', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './05-prefix.test.css')
+    let expectedPath = path.resolve(__dirname, './prefix.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/13-custom-extractors.test.html renamed to tests/custom-extractors.test.html

@@ -9,7 +9,7 @@ function run(input, config = {}) {
 
 test('responsive and variants atrules', () => {
   let config = {
-    purge: [path.resolve(__dirname, './07-responsive-and-variants-atrules.test.html')],
+    purge: [path.resolve(__dirname, './responsive-and-variants-atrules.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -80,7 +80,7 @@ test('responsive and variants atrules', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './07-responsive-and-variants-atrules.test.css')
+    let expectedPath = path.resolve(__dirname, './responsive-and-variants-atrules.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)

tests/13-custom-extractors.test.js renamed to tests/custom-extractors.test.js

@@ -10,7 +10,7 @@ function run(input, config = {}) {
 test('variants', () => {
   let config = {
     darkMode: 'class',
-    purge: [path.resolve(__dirname, './02-variants.test.html')],
+    purge: [path.resolve(__dirname, './variants.test.html')],
     corePlugins: { preflight: false },
     theme: {},
     plugins: [],
@@ -23,7 +23,7 @@ test('variants', () => {
   `
 
   return run(css, config).then((result) => {
-    let expectedPath = path.resolve(__dirname, './02-variants.test.css')
+    let expectedPath = path.resolve(__dirname, './variants.test.css')
     let expected = fs.readFileSync(expectedPath, 'utf8')
 
     expect(result.css).toMatchCss(expected)