@applitools/visual-grid-client
Advanced tools
Comparing version 5.3.6 to 5.3.7
{ | ||
"name": "@applitools/visual-grid-client", | ||
"version": "5.3.6", | ||
"version": "5.3.7", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "src/visual-grid-client.js", |
@@ -8,5 +8,5 @@ 'use strict'; | ||
function assignWithoutOverride(obj1, obj2) { | ||
function assignContentfulResources(obj1, obj2) { | ||
for (const p in obj2) { | ||
if (!obj1[p]) { | ||
if (!obj1[p] || !obj1[p].getContent()) { | ||
obj1[p] = obj2[p]; | ||
@@ -69,3 +69,3 @@ } | ||
for (const url in preResources) { | ||
Object.assign(resources, await processResource(preResources[url])); | ||
assignContentfulResources(resources, await processResource(preResources[url])); | ||
} | ||
@@ -77,3 +77,3 @@ | ||
if (cacheEntry) { | ||
assignWithoutOverride(resources, mapValues(cacheEntry, fromCacheToRGridResource)); | ||
assignContentfulResources(resources, mapValues(cacheEntry, fromCacheToRGridResource)); | ||
} else if (/^https?:$/i.test(new URL(url).protocol)) { | ||
@@ -87,3 +87,5 @@ missingResourceUrls.push(url); | ||
fetchResource(url) | ||
.then(async resource => assignWithoutOverride(resources, await processResource(resource))) | ||
.then(async resource => | ||
assignContentfulResources(resources, await processResource(resource)), | ||
) | ||
.catch(ex => { | ||
@@ -90,0 +92,0 @@ logger.log(`error fetching resource at ${url}: ${ex}`); |
75877
2014