Move tests to their proper location

Author: graygilmore

packages/theme/src/cli/services/dev.test.ts

@@ -1,9 +1,8 @@
 import {openURLSafely, renderLinks} from './dev.js'
-import {ensureLiveThemeConfirmed} from '../utilities/theme-ui.js'
 import {describe, expect, test, vi} from 'vitest'
 import {buildTheme} from '@shopify/cli-kit/node/themes/factories'
-import {DEVELOPMENT_THEME_ROLE, LIVE_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils'
-import {renderConfirmationPrompt, renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui'
+import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils'
+import {renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui'
 import {openURL} from '@shopify/cli-kit/node/system'
 
 vi.mock('@shopify/cli-kit/node/ui')
@@ -18,11 +17,10 @@ vi.mock('@shopify/cli-kit/node/system', () => ({
   openURL: vi.fn(),
 }))
 
-describe('dev', () => {
-  const store = 'my-store.myshopify.com'
-  const theme = buildTheme({id: 123, name: 'My Theme', role: DEVELOPMENT_THEME_ROLE})!
-  const liveTheme = buildTheme({id: 123, name: 'My Theme', role: LIVE_THEME_ROLE})!
+const store = 'my-store.myshopify.com'
+const theme = buildTheme({id: 123, name: 'My Theme', role: DEVELOPMENT_THEME_ROLE})!
 
+describe('renderLinks', () => {
   test('renders "dev" command links', async () => {
     // Given
     const themeId = theme.id.toString()
@@ -85,57 +83,22 @@ describe('dev', () => {
       ],
     })
   })
-  describe('openURLSafely', () => {
-    test('calls renderWarning when openURL fails', async () => {
-      // Given
-      const error = new Error('Failed to open URL')
-      vi.mocked(openURL).mockRejectedValueOnce(error)
-
-      // When
-      openURLSafely('http://127.0.0.1:9292', 'localhost')
-
-      // Then
-      await vi.waitFor(() => {
-        expect(renderWarning).toHaveBeenCalledWith({
-          headline: 'Failed to open localhost.',
-          body: error.stack ?? error.message,
-        })
-      })
-    })
-  })
-  describe('ensureLiveThemeConfirmed', () => {
-    vi.stubGlobal('process', {...process, stdout: {...process.stdout, isTTY: true}})
-
-    test('prompts for confirmation if acting on a live theme', async () => {
-      // Given
-      vi.mocked(renderConfirmationPrompt).mockResolvedValue(true)
+})
+describe('openURLSafely', () => {
+  test('calls renderWarning when openURL fails', async () => {
+    // Given
+    const error = new Error('Failed to open URL')
+    vi.mocked(openURL).mockRejectedValueOnce(error)
 
-      const result = await ensureLiveThemeConfirmed(liveTheme, 'start development mode', false)
+    // When
+    openURLSafely('http://127.0.0.1:9292', 'localhost')
 
-      // Then
-      expect(renderConfirmationPrompt).toHaveBeenCalledWith({
-        message:
-          'You\'re about to start development mode on your live theme "My Theme". This will make changes visible to customers. Are you sure you want to proceed?',
-        confirmationMessage: 'Yes, proceed with live theme',
-        cancellationMessage: 'No, cancel',
+    // Then
+    await vi.waitFor(() => {
+      expect(renderWarning).toHaveBeenCalledWith({
+        headline: 'Failed to open localhost.',
+        body: error.stack ?? error.message,
       })
-      expect(result).toBe(true)
-    })
-
-    test('does not prompt for confirmation if acting on a non-live theme', async () => {
-      // Given
-      await ensureLiveThemeConfirmed(theme, 'start development mode', false)
-
-      // Then
-      expect(renderConfirmationPrompt).not.toHaveBeenCalled()
-    })
-
-    test('does not prompt for confirmation if acting on a live theme and allowLive flag is true', async () => {
-      // Given
-      await ensureLiveThemeConfirmed(liveTheme, 'start development mode', true)
-
-      // Then
-      expect(renderConfirmationPrompt).not.toHaveBeenCalled()
     })
   })
 })

packages/theme/src/cli/utilities/theme-ui.test.ts

@@ -1,7 +1,9 @@
-import {themeComponent, themesComponent, ensureDirectoryConfirmed} from './theme-ui.js'
+import {themeComponent, themesComponent, ensureDirectoryConfirmed, ensureLiveThemeConfirmed} from './theme-ui.js'
 import {Theme} from '@shopify/cli-kit/node/themes/types'
 import {renderConfirmationPrompt, renderError, renderWarning} from '@shopify/cli-kit/node/ui'
-import {test, describe, expect, vi} from 'vitest'
+import {test, describe, expect, vi, beforeEach} from 'vitest'
+import {DEVELOPMENT_THEME_ROLE, LIVE_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils'
+import {buildTheme} from '@shopify/cli-kit/node/themes/factories'
 
 vi.mock('@shopify/cli-kit/node/ui')
 
@@ -69,6 +71,47 @@ describe('ensureDirectoryConfirmed', () => {
   })
 })
 
+describe('ensureLiveThemeConfirmed', () => {
+  const theme = buildTheme({id: 123, name: 'My Theme', role: DEVELOPMENT_THEME_ROLE})!
+  const liveTheme = buildTheme({id: 123, name: 'My Theme', role: LIVE_THEME_ROLE})!
+
+  beforeEach(() => {
+    vi.stubGlobal('process', {...process, stdout: {...process.stdout, isTTY: true}})
+  })
+
+  test('prompts for confirmation if acting on a live theme', async () => {
+    // Given
+    vi.mocked(renderConfirmationPrompt).mockResolvedValue(true)
+
+    const result = await ensureLiveThemeConfirmed(liveTheme, 'start development mode', false)
+
+    // Then
+    expect(renderConfirmationPrompt).toHaveBeenCalledWith({
+      message:
+        'You\'re about to start development mode on your live theme "My Theme". This will make changes visible to customers. Are you sure you want to proceed?',
+      confirmationMessage: 'Yes, proceed with live theme',
+      cancellationMessage: 'No, cancel',
+    })
+    expect(result).toBe(true)
+  })
+
+  test('does not prompt for confirmation if acting on a non-live theme', async () => {
+    // Given
+    await ensureLiveThemeConfirmed(theme, 'start development mode', false)
+
+    // Then
+    expect(renderConfirmationPrompt).not.toHaveBeenCalled()
+  })
+
+  test('does not prompt for confirmation if acting on a live theme and allowLive flag is true', async () => {
+    // Given
+    await ensureLiveThemeConfirmed(liveTheme, 'start development mode', true)
+
+    // Then
+    expect(renderConfirmationPrompt).not.toHaveBeenCalled()
+  })
+})
+
 function theme(id: number) {
   return {id, name: `theme ${id}`} as Theme
 }