modify tests

Author: stephtr

src/JestExt.ts

@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import { Settings, ProjectWorkspace, JestTotalResults } from 'jest-editor-support'
 import { matcher } from 'micromatch'
+import { platform } from 'os'
 
 import * as decorations from './decorations'
 import { IPluginSettings } from './Settings'
@@ -23,7 +24,6 @@ import { hasDocument, isOpenInMultipleEditors } from './editor'
 import { CoverageOverlay } from './Coverage/CoverageOverlay'
 import { JestProcess, JestProcessManager } from './JestProcessManagement'
 import { isWatchNotSupported, WatchMode } from './Jest'
-import { platform } from 'os'
 
 export class JestExt {
   private workspace: ProjectWorkspace

src/JestProcessManagement/JestProcess.ts

@@ -18,8 +18,8 @@ export class JestProcess {
     this.stopRequested = false
     let exited = false
 
-    const options = { shell: platform() === 'win32' }
-    this.runner = new Runner(this.projectWorkspace, options)
+    const useShell = platform() === 'win32'
+    this.runner = new Runner(this.projectWorkspace, { shell: useShell })
 
     this.restoreJestEvents()
 

tests/JestExt.test.ts

@@ -4,15 +4,21 @@ jest.unmock('../src/JestExt')
 jest.mock('../src/DebugCodeLens', () => ({
   DebugCodeLensProvider: class MockCodeLensProvider {},
 }))
+jest.mock('os')
 
 import { JestExt } from '../src/JestExt'
 import { ProjectWorkspace, Settings } from 'jest-editor-support'
+import { platform } from 'os'
 import { window, workspace, debug } from 'vscode'
 import { hasDocument, isOpenInMultipleEditors } from '../src/editor'
 import { failingAssertionStyle } from '../src/decorations'
 
 describe('JestExt', () => {
   const mockSettings = (Settings as any) as jest.Mock<any>
+  const mockSettingsObject = {
+    getConfig: callback => callback(),
+    jestVersionMajor: 22,
+  }
   const getConfiguration = workspace.getConfiguration as jest.Mock<any>
   let projectWorkspace: ProjectWorkspace
   const channelStub = { appendLine: () => {} } as any
@@ -27,8 +33,8 @@ describe('JestExt', () => {
   })
 
   it('should show error message if jest version i < 18', () => {
-    mockSettings.mockImplementation(() => ({
-      getConfig: callback => callback(),
+    mockSettings.mockImplementationOnce(() => ({
+      ...mockSettingsObject,
       jestVersionMajor: 17,
     }))
     new JestExt(null, projectWorkspace, channelStub, extensionSettings)
@@ -37,14 +43,20 @@ describe('JestExt', () => {
   })
 
   it.skip('should not show error message if jest version is 20', () => {
-    mockSettings.mockImplementation(() => ({
-      getConfig: callback => callback(),
-      jestVersionMajor: 20,
-    }))
+    mockSettings.mockImplementationOnce(() => mockSettingsObject)
     new JestExt(null, projectWorkspace, channelStub, extensionSettings)
     expect(window.showErrorMessage).not.toBeCalled()
   })
 
+  it('should create `Settings` with `shell` set on Windows', () => {
+    mockSettings.mockImplementationOnce((_, options) => {
+      expect(options.shell).toBe(true)
+      return mockSettingsObject
+    })
+    ;((platform as any) as jest.Mock<any>).mockReturnValueOnce('win32')
+    new JestExt(null, projectWorkspace, channelStub, extensionSettings)
+  })
+
   describe('resetInlineErrorDecorators()', () => {
     let sut: JestExt
     const editor: any = {

tests/helpers.test.ts

@@ -169,29 +169,7 @@ describe('ModuleHelpers', () => {
       expect(mockNormalize).toBeCalledWith(settings.pathToJest)
     })
 
-    it('defaults to "node_modules/.bin/jest.cmd" on Windows when Jest is locally installed', () => {
-      const expected = 'node_modules\\.bin\\jest.cmd'
-
-      mockJoin.mockImplementation(require.requireActual('path').win32.join)
-      mockPlatform.mockReturnValue('win32')
-      mockNormalize.mockImplementationOnce(arg => arg)
-      mockExistsSync.mockImplementation(path => path === expected)
-
-      expect(pathToJest(defaultSettings)).toBe(expected)
-    })
-
-    it('defaults to "jest.cmd" on Windows when Jest is not locally installed', () => {
-      const expected = 'jest.cmd'
-
-      mockJoin.mockImplementation(require.requireActual('path').win32.join)
-      mockPlatform.mockReturnValue('win32')
-      mockNormalize.mockImplementationOnce(arg => arg)
-      mockExistsSync.mockImplementation(_ => false)
-
-      expect(pathToJest(defaultSettings)).toBe(expected)
-    })
-
-    it('defaults to "node_modules/.bin/jest" on a non-Windows OS when Jest is locally installed', () => {
+    it('defaults to "node_modules/.bin/jest" when Jest is locally installed', () => {
       const expected = 'node_modules/.bin/jest'
 
       mockJoin.mockImplementation(require.requireActual('path').posix.join)
@@ -202,7 +180,7 @@ describe('ModuleHelpers', () => {
       expect(pathToJest(defaultSettings)).toBe(expected)
     })
 
-    it('defaults to "jest" on a non-Windows OS when Jest is locally installed', () => {
+    it('defaults to "jest" when Jest is locally installed', () => {
       const expected = 'jest'
 
       mockJoin.mockImplementation(require.requireActual('path').posix.join)