Skip to content
This repository has been archived by the owner on Mar 20, 2024. It is now read-only.

Commit

Permalink
fix(visual-grid-client): now referrer is per checkWindow
Browse files Browse the repository at this point in the history
  • Loading branch information
danielschwartz85 committed Sep 11, 2019
1 parent 5906063 commit 4998285
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 10 deletions.
2 changes: 1 addition & 1 deletion packages/visual-grid-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@applitools/visual-grid-client",
"version": "12.29.0",
"version": "12.29.1",
"description": "",
"keywords": [
"applitools",
Expand Down
3 changes: 3 additions & 0 deletions packages/visual-grid-client/src/sdk/checkWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function makeCheckWindow({
stepCounter,
testName,
openEyesPromises,
fetchHeaders,
matchLevel: _matchLevel,
}) {
return function checkWindow({
Expand All @@ -50,6 +51,7 @@ function makeCheckWindow({
enablePatterns,
ignoreDisplacements,
source,
referrer,
}) {
if (target === 'window' && !fully) {
sizeMode = 'viewport';
Expand All @@ -58,6 +60,7 @@ function makeCheckWindow({
} else if (target === 'region' && region) {
sizeMode = 'region';
}
fetchHeaders['Referer'] = referrer;

const currStepCount = ++stepCounter;
logger.log(`running checkWindow for test ${testName} step #${currStepCount}`);
Expand Down
11 changes: 4 additions & 7 deletions packages/visual-grid-client/src/sdk/openEyes.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ function makeOpenEyes({
compareWithParentBranch: _compareWithParentBranch,
ignoreBaseline: _ignoreBaseline,
userAgent: _userAgent,
referrer: _referrer,
createRGridDOMAndGetResourceMapping: _createRGridDOMAndGetResourceMapping,
apiKey,
proxy,
Expand All @@ -60,7 +59,6 @@ function makeOpenEyes({
displayName,
wrappers,
userAgent = _userAgent,
referrer = _referrer,
appName = _appName,
browser = _browser,
saveDebugData = _saveDebugData,
Expand Down Expand Up @@ -167,11 +165,9 @@ function makeOpenEyes({
let checkWindowPromises = wrappers.map(() => Promise.resolve());
const testController = makeTestContorler({testName, numOfTests: wrappers.length, logger});

const headers = {'User-Agent': userAgent, Referer: referrer};
const createRGridDOMAndGetResourceMapping =
headers['User-Agent'] || headers['Referer']
? arg => _createRGridDOMAndGetResourceMapping(Object.assign({fetchOptions: {headers}}, arg))
: _createRGridDOMAndGetResourceMapping;
const headers = {'User-Agent': userAgent};
const createRGridDOMAndGetResourceMapping = args =>
_createRGridDOMAndGetResourceMapping(Object.assign({fetchOptions: {headers}}, args));

const checkWindow = makeCheckWindow({
testController,
Expand All @@ -190,6 +186,7 @@ function makeOpenEyes({
testName,
openEyesPromises,
matchLevel,
fetchHeaders: headers,
});

const close = makeClose({
Expand Down
2 changes: 0 additions & 2 deletions packages/visual-grid-client/src/sdk/renderingGridClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function makeRenderingGridClient({
agentId,
fetchResourceTimeout = 120000,
userAgent,
referrer,
}) {
const openEyesConcurrency = Number(concurrency);

Expand Down Expand Up @@ -171,7 +170,6 @@ function makeRenderingGridClient({
eyesTransactionThroat,
agentId,
userAgent,
referrer,
});

return {
Expand Down
35 changes: 35 additions & 0 deletions packages/visual-grid-client/test/unit/sdk/checkWindow.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';
const {describe, it} = require('mocha');
const {expect} = require('chai');
const makeCheckWindow = require('../../../src/sdk/checkWindow');
const makeTestContorler = require('../../../src/sdk/makeTestContorler');

describe('checkWindow', () => {
it('handles fetchHeaders correctly', async () => {
const fetchHeaders = {['User-Agent']: 'some agent'};
const checkWindow = makeCheckWindow({
testController: makeTestContorler({numOfTests: 0, logger: console}),
createRGridDOMAndGetResourceMapping: () => {},
renderBatch: () => {},
waitForRenderedStatus: () => {},
renderInfo: {},
logger: console,
getCheckWindowPromises: () => {},
setCheckWindowPromises: () => {},
browsers: [],
wrappers: [],
renderThroat: () => {},
testName: 'some test',
openEyesPromises: () => {},
fetchHeaders,
});
await checkWindow({resourceUrls: [], referrer: 'some referrer'});
expect(fetchHeaders).to.eql({Referer: 'some referrer', ['User-Agent']: 'some agent'});

await checkWindow({resourceUrls: []});
expect(fetchHeaders).to.eql({Referer: undefined, ['User-Agent']: 'some agent'});

await checkWindow({resourceUrls: [], referrer: 'some referrer 2'});
expect(fetchHeaders).to.eql({Referer: 'some referrer 2', ['User-Agent']: 'some agent'});
});
});

0 comments on commit 4998285

Please sign in to comment.