From 54cb95a30a272d0425091b84185a0c9f4cd32671 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 6 Sep 2022 16:32:39 +0100
Subject: [PATCH] test: use semantic `runIf` and `skipIf` helpers

---
 test/basic.test.ts | 87 ++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 49 deletions(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index d15b0919376..d9b08dc82e7 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -393,28 +393,26 @@ describe('automatically keyed composables', () => {
   })
 })
 
-if (!process.env.NUXT_TEST_DEV && !process.env.TEST_WITH_WEBPACK) {
-  describe('inlining component styles', () => {
-    it('should inline styles', async () => {
-      const html = await $fetch('/styles')
-      for (const style of [
-        '{--assets:"assets"}', // <script>
-        '{--scoped:"scoped"}', // <style lang=css>
-        '{--postcss:"postcss"}', // <style lang=postcss>
-        '{--global:"global"}', // entryfile dependency
-        '{--plugin:"plugin"}', // plugin dependency
-        '{--functional:"functional"}' // functional component with css import
-      ]) {
-        expect(html).toContain(style)
-      }
-    })
-    it.todo('does not render style hints for inlined styles')
-    it.todo('renders client-only styles?', async () => {
-      const html = await $fetch('/styles')
-      expect(html).toContain('{--client-only:"client-only"}')
-    })
+describe.skipIf(process.env.NUXT_TEST_DEV || process.env.TEST_WITH_WEBPACK)('inlining component styles', () => {
+  it('should inline styles', async () => {
+    const html = await $fetch('/styles')
+    for (const style of [
+      '{--assets:"assets"}', // <script>
+      '{--scoped:"scoped"}', // <style lang=css>
+      '{--postcss:"postcss"}', // <style lang=postcss>
+      '{--global:"global"}', // entryfile dependency
+      '{--plugin:"plugin"}', // plugin dependency
+      '{--functional:"functional"}' // functional component with css import
+    ]) {
+      expect(html).toContain(style)
+    }
   })
-}
+  it.todo('does not render style hints for inlined styles')
+  it.todo('renders client-only styles?', async () => {
+    const html = await $fetch('/styles')
+    expect(html).toContain('{--client-only:"client-only"}')
+  })
+})
 
 describe('prefetching', () => {
   it('should prefetch components', async () => {
@@ -429,34 +427,29 @@ describe('prefetching', () => {
   })
 })
 
-if (process.env.NUXT_TEST_DEV) {
-  describe('detecting invalid root nodes', () => {
-    it('should detect invalid root nodes in pages', async () => {
-      for (const path of ['1', '2', '3', '4']) {
-        const { consoleLogs } = await renderPage(joinURL('/invalid-root', path))
-        const consoleLogsWarns = consoleLogs.filter(i => i.type === 'warning').map(w => w.text).join('\n')
-        expect(consoleLogsWarns).toContain('does not have a single root node and will cause errors when navigating between routes')
-      }
-    })
+describe.runIf(process.env.NUXT_TEST_DEV)('detecting invalid root nodes', () => {
+  it('should detect invalid root nodes in pages', async () => {
+    for (const path of ['1', '2', '3', '4']) {
+      const { consoleLogs } = await renderPage(joinURL('/invalid-root', path))
+      const consoleLogsWarns = consoleLogs.filter(i => i.type === 'warning').map(w => w.text).join('\n')
+      expect(consoleLogsWarns).toContain('does not have a single root node and will cause errors when navigating between routes')
+    }
+  })
 
-    it('should not complain if there is no transition', async () => {
-      for (const path of ['fine']) {
-        const { consoleLogs } = await renderPage(joinURL('/invalid-root', path))
+  it('should not complain if there is no transition', async () => {
+    for (const path of ['fine']) {
+      const { consoleLogs } = await renderPage(joinURL('/invalid-root', path))
 
-        const consoleLogsWarns = consoleLogs.filter(i => i.type === 'warning')
+      const consoleLogsWarns = consoleLogs.filter(i => i.type === 'warning')
 
-        expect(consoleLogsWarns.length).toEqual(0)
-      }
-    })
+      expect(consoleLogsWarns.length).toEqual(0)
+    }
   })
-}
+})
 
 describe('dynamic paths', () => {
-  if (process.env.NUXT_TEST_DEV) {
-    // TODO:
-    it.todo('dynamic paths in dev')
-    return
-  }
+  // TODO:
+  it.runIf(process.env.NUXT_TEST_DEV).todo('dynamic paths in dev')
 
   it('should work with no overrides', async () => {
     const html: string = await $fetch('/assets')
@@ -466,12 +459,8 @@ describe('dynamic paths', () => {
     }
   })
 
-  it('adds relative paths to CSS', async () => {
-    if (process.env.TEST_WITH_WEBPACK) {
-      // Webpack injects CSS differently
-      return
-    }
-
+  // Webpack injects CSS differently
+  it.skipIf(process.env.TEST_WITH_WEBPACK)('adds relative paths to CSS', async () => {
     const html: string = await $fetch('/assets')
     const urls = Array.from(html.matchAll(/(href|src)="(.*?)"|url\(([^)]*?)\)/g)).map(m => m[2] || m[3])
     const cssURL = urls.find(u => /_nuxt\/assets.*\.css$/.test(u))