@applitools/visual-grid-client - npm Package Compare versions

Comparing version 15.8.56 to 15.8.57

package.json

 {
   "name": "@applitools/visual-grid-client",
-  "version": "15.8.56",
+  "version": "15.8.57",
   "description": "",
@@ -40,3 +40,3 @@ "keywords": [
     "@applitools/jsdom": "1.0.4",
-    "@applitools/logger": "1.0.8",
+    "@applitools/logger": "1.0.9",
     "abort-controller": "3.0.0",
@@ -56,3 +56,3 @@ "chalk": "3.0.0",
   "devDependencies": {
-    "@applitools/dom-snapshot": "4.5.11",
+    "@applitools/dom-snapshot": "4.5.12",
     "@applitools/sdk-release-kit": "0.13.10",
@@ -59,0 +59,0 @@ "@applitools/test-server": "1.0.8",

src/sdk/checkWindow.js

@@ -314,5 +314,6 @@ 'use strict'
         renderThroat(async () => {
-          logger.log(`starting to render test ${testName}`)
+          logger.log(`starting to render test ${testName} stepCount #${currStepCount}`)
           renderJobs.set(renderRequest, resolve)
           const [renderIdErr, renderId] = await presult(render(renderRequest))
+          logger.log(`done render test ${testName} stepCount #${currStepCount}`)
           if (renderIdErr) {
@@ -319,0 +320,0 @@ renderRequestTask.reject(renderIdErr)

src/sdk/getAllResources.js

@@ -86,11 +86,12 @@ 'use strict'
         if (cacheEntry) {
+          const cacheEntries = await Promise.all(Object.values(cacheEntry))
           assignContentfulResources(
             resources,
-            mapKeys(mapValues(cacheEntry, fromCacheToRGridResource), value => value.getUrl()),
+            mapKeys(mapValues(cacheEntries, fromCacheToRGridResource), value => value.getUrl()),
           )
-          const cacheEntryKeys = Object.keys(cacheEntry)
+          const cacheEntryKeys = Object.keys(cacheEntries)
           logger.log(
             `resource retrieved from cache, with dependencies (${
               cacheEntryKeys.length
-            }): ${rGridResource.getUrl()} with dependencies --> ${cacheEntryKeys}`,
+            }): ${rGridResource.getUrl()} --> ${cacheEntryKeys}`,
           )
@@ -134,2 +135,11 @@ } else if (rGridResource.isHttp()) {
         resourceCache.setValue(rGridResource.getCacheKey(), toCacheEntry(rGridResource))
+      } else {
+        // Create a dummy promise so when we call getWithDependencies we will wait for ALL the resource dependencies
+        // to be added to the resourceCache. This promise is resolved in putResources
+
+        let resolve
+        const promise = new Promise(thisResolve => (resolve = thisResolve))
+        promise.resolve = resolve
+
+        resourceCache.setValue(rGridResource.getCacheKey(), promise)
       }
@@ -136,0 +146,0 @@ resourceCache.setDependencies(rGridResource.getCacheKey(), dependentResources)

src/sdk/putResources.js

@@ -60,3 +60,8 @@ 'use strict'
       const doesRequireProcessing = Boolean(resourceType(resource.getContentType()))
+      // resolve the dummy promise as we now set the real value of the resource to the cacheResouce
+      const resourceValue = resourceCache.getValue(cacheKey)
       resourceCache.setValue(cacheKey, toCacheEntry(resource, doesRequireProcessing))
+      if (resourceValue && resourceValue.resolve) {
+        resourceValue.resolve(resourceCache.getValue(cacheKey))
+      }
     }
@@ -63,0 +68,0 @@ return result

src/sdk/renderingGridClient.js

@@ -6,3 +6,3 @@ /* global fetch */
   BatchInfo,
-  GeneralUtils: {backwardCompatible, deprecationWarning},
+  GeneralUtils: {backwardCompatible, deprecationWarning, getEnvValue},
   RunnerStartedEvent,
@@ -91,3 +91,3 @@ } = require('@applitools/eyes-sdk-core/shared')
   visualGridOptions,
-  concurrentRendersPerTest = 1,
+  concurrentRendersPerTest,
   ignoreGitMergeBase,
@@ -105,2 +105,4 @@ }) {
 
+  concurrentRendersPerTest = Number(getEnvValue('CONCURRENT_RENDERS_PER_TEST')) || 1
+
   logger = logger || makeLogger({label: 'visual-grid-client', level: showLogs ? 'info' : 'silent'})
@@ -266,3 +268,8 @@ logger.verbose('vgc concurrency is', finalConcurrency)
 
-    const runnerStaredEvent = RunnerStartedEvent({concurrency, testConcurrency, defaultConcurrency})
+    const runnerStaredEvent = RunnerStartedEvent({
+      concurrency,
+      testConcurrency,
+      defaultConcurrency,
+      concurrentRendersPerTest,
+    })
     logger.verbose('runnerStartedEvent', runnerStaredEvent)
@@ -269,0 +276,0 @@ const [[err, renderInfo]] = await Promise.all([

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

237074

increased by0.48%

Lines of code

3172

increased by0.63%

Dependency changes

• + Added@applitools/logger@1.0.9(transitive)

• Updated@applitools/logger@1.0.9