Merge 3494ad4 into 44f07ff

src/bin/testProcess.ts

@@ -1,46 +1,58 @@
 import { spawn, spawnSync, SpawnSyncOptions } from 'child_process'
 import { readConfig } from '../utils'
-import { checkBrowsers, getResultByStatus } from './utils'
+import { checkBrowsers, getLogMessage } from './utils'
 import { PARALLEL, BrowserType } from '../constants'
 
-const getSpawnOptions = (browser: BrowserType): SpawnSyncOptions => ({
+const getSpawnOptions = (
+  browser: BrowserType,
+  device: string | null,
+): SpawnSyncOptions => ({
   stdio: 'inherit',
   shell: true,
   env: {
     ...process.env,
     BROWSER: browser,
+    ...(device ? { DEVICE: device } : {}),
   },
 })
 
 const exec = ({
   sequence,
   browser,
+  device = null,
   params,
 }: {
   sequence: string
   browser: BrowserType
+  device?: string | null
   params: string[]
 }): void => {
-  const options = getSpawnOptions(browser)
+  const options = getSpawnOptions(browser, device)
   if (sequence === PARALLEL) {
     const process = spawn('node', [`node_modules/.bin/jest ${params}`], options)
     process.on('close', status => {
-      console.log(`${getResultByStatus(status)} tests for ${browser}\n\n`)
+      console.log(getLogMessage(browser, status, device))
     })
   } else {
     const { status } = spawnSync(
       'node',
       [`node_modules/.bin/jest ${params}`],
       options,
     )
-    console.log(`${getResultByStatus(status)} tests for ${browser}`)
+    console.log(getLogMessage(browser, status, device))
   }
 }
 
 const runner = async (sequence: string, params: string[]): Promise<void> => {
-  const { browsers = [] } = await readConfig()
+  const { browsers = [], devices = [] } = await readConfig()
   checkBrowsers(browsers)
-  browsers.forEach(browser => exec({ sequence, browser, params }))
+  if (devices.length) {
+    browsers.forEach(browser =>
+      devices.forEach(device => exec({ sequence, browser, device, params })),
+    )
+  } else {
+    browsers.forEach(browser => exec({ sequence, browser, params }))
+  }
 }
 
 export default runner

src/bin/utils.test.ts

@@ -1,4 +1,4 @@
-import { checkBrowsers, getResultByStatus } from './utils'
+import { checkBrowsers, getResultByStatus, getLogMessage } from './utils'
 import { BrowserType } from '../constants'
 
 describe('checkBrowsers', () => {
@@ -32,3 +32,17 @@ describe('getResultByStatus', () => {
     expect(getResultByStatus(0)).toBe('Passed')
   })
 })
+
+describe('getLogMessage', () => {
+  it('should return right log', () => {
+    expect(getLogMessage('chromium', 0, null)).toBe(
+      'Passed tests for browser: chromium \n\n',
+    )
+  })
+
+  it('should return right log', () => {
+    expect(getLogMessage('chromium', 1, 'iPhone 6')).toBe(
+      'Failed tests for browser: chromium and device: iPhone 6\n\n',
+    )
+  })
+})

src/bin/utils.ts

@@ -13,3 +13,13 @@ export const checkBrowsers = (browsers?: BrowserType[]): void => {
 export const getResultByStatus = (status: number | null): string => {
   return status !== 0 ? 'Failed' : 'Passed'
 }
+
+export const getLogMessage = (
+  browser: BrowserType,
+  status: number | null,
+  device: string | null,
+): string => {
+  return `${getResultByStatus(status)} tests for browser: ${browser} ${
+    device ? `and device: ${device}` : ''
+  }\n\n`
+}

src/constants.ts

@@ -17,6 +17,7 @@ export interface Config {
   browser?: BrowserType
   browsers?: BrowserType[]
   device?: string
+  devices?: string[]
   server?: JestDevServerOptions
 }