@applitools/visual-grid-cli-utils 1.21.26 → 1.21.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/visual-grid-cli-utils",
-  "version": "1.21.26",
+  "version": "1.21.29",
   "description": "",
   "main": "src/visual-grid-cli-utils.js",
   "engines": {

package/src/compare.js

@@ -18,6 +18,7 @@ async function main(args) {
 
 async function compareWithEyes(rerenderResults) {
   const eyes = new Eyes()
+  let batchUrl
   try {
     // Initialize the eyes configuration
     const configuration = new Configuration()
@@ -29,7 +30,6 @@ async function compareWithEyes(rerenderResults) {
     eyes.setConfiguration(configuration)
 
     const uuid = randomUUID()
-    let batchUrl
     let i = 0
     for (const result of rerenderResults) {
       await eyes.open('VG-CLI compare', `Compare browsers ${uuid}`)
@@ -39,9 +39,11 @@ async function compareWithEyes(rerenderResults) {
       console.log(`${++i}. ${name} check result: ${resp}`)
       await eyes.close()
     }
-    console.log('\nBatch results: \n', batchUrl)
+  } catch (err) {
+    console.error(err)
   } finally {
     await eyes.abortIfNotClosed()
+    console.log('\nBatch results: \n', batchUrl)
   }
 }
 

package/src/job-info.js

@@ -15,6 +15,10 @@ async function main({
   deviceOrientation,
   iosDeviceName,
   iosDeviceOrientation,
+  androidDeviceName,
+  androidVersion,
+  androidDeviceOrientation,
+  androidVhsType,
   serverUrl,
   accountOverride,
   canary,
@@ -44,6 +48,14 @@ async function main({
               version: canary ? 'canary' : iosVersion,
             }
           : undefined,
+        androidDeviceInfo: androidDeviceName
+          ? {
+              name: androidDeviceName,
+              version: canary ? 'canary' : androidVersion,
+              screenOrientation: androidDeviceOrientation,
+            }
+          : undefined,
+        vhsType: androidDeviceName ? androidVhsType : undefined,
         width: deviceEmulation || iosDeviceName ? undefined : width,
         height: deviceEmulation || iosDeviceName ? undefined : height,
         target: 'full-page',
@@ -54,7 +66,10 @@ async function main({
         : {
             name: iosDeviceName ? 'safari' : canary ? convertBrowserNameToCanary(browser) : browser,
           },
-      platform: {name: iosDeviceName ? 'ios' : undefined, type: native ? 'native' : 'web'},
+      platform: {
+        name: iosDeviceName ? 'ios' : androidDeviceName ? 'android' : undefined,
+        type: native ? 'native' : 'web',
+      },
       options,
     },
     {

package/src/view-rendering.js

@@ -27,12 +27,18 @@ async function main({
   const viewRenderingUrl = calculateViewRenderingUrl(renderId, finalAuthToken, accountOverride)
 
   if (downloadVhsFolder) {
-    const response = await fetch(viewRenderingUrl)
+    let response = await fetch(viewRenderingUrl)
     if (!response.ok) await throwErrorFromBadStatus(viewRenderingUrl, response)
     const contentType = response.headers.get('content-type')
-    if (!contentType.includes('x-applitools-vhs')) {
+    if (contentType.includes('json')) {
+      const body = await response.json()
+
+      response = await fetch(body.vhs)
+      if (!response.ok) await throwErrorFromBadStatus(viewRenderingUrl, response)
+    } else if (!contentType.includes('x-applitools-vhs')) {
       throw new Error('Content type is not VHS, it is: ' + contentType)
     }
+
     const resource = await response.buffer()
     const fname = `${downloadVhsFolder}/${renderId}.vhs`
     fs.writeFileSync(fname, resource)

package/src/visual-grid-cli-utils.js

@@ -490,6 +490,28 @@ async function main(argv, {shouldExitOnError = false} = {}) {
           choices: ['portrait', 'landscapeLeft', 'landscapeRight'],
           default: 'portrait',
         })
+        .option('android-device-name', {
+          describe: 'the name of the Android device to use',
+          type: 'string',
+        })
+        .option('android-version', {
+          describe:
+            'The Android version to use (latest, latest-1 or latest-2 - relative to the device)',
+          type: 'string',
+          default: 'latest',
+        })
+        .option('android-device-orientation', {
+          describe: 'screen orientation',
+          type: 'string',
+          choices: ['portrait', 'landscape'],
+          default: 'portrait',
+        })
+        .option('android-vhs-type', {
+          describe: 'vhs type',
+          type: 'string',
+          choices: ['android-x', 'android-support'],
+          default: 'android-x',
+        })
         .option('browser', {
           alias: 'b',
           describe: 'the browser to render to',