Skip to content

Commit 2b87099

Browse files
kobenguyentkobenguyent
committed
fix: PW test
1 parent be6076e commit 2b87099

File tree

13 files changed

+90
-88
lines changed

13 files changed

+90
-88
lines changed

‎lib/assert/equal.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@ export function fileEquals(file) {
4343
}
4444

4545
export { EqualityAssertion as Assertion };
46-
export default {
47-
equals: jar => new EqualityAssertion({ jar }),
48-
urlEquals: (baseUrl) => {
49-
const assert = new EqualityAssertion({ jar: 'url of current page' });
50-
assert.comparator = function (expected, actual) {
51-
if (expected.indexOf('http') !== 0) {
52-
actual = actual.slice(actual.indexOf(baseUrl) + baseUrl.length);
53-
}
54-
return actual === expected;
55-
};
56-
return assert;
57-
},
58-
};
46+
export const equals = jar => {
47+
return new EqualityAssertion({ jar });
48+
}
49+
50+
export const urlEquals = (baseUrl) => {
51+
const assert = new EqualityAssertion({ jar: 'url of current page' });
52+
assert.comparator = function (expected, actual) {
53+
if (expected.indexOf('http') !== 0) {
54+
actual = actual.slice(actual.indexOf(baseUrl) + baseUrl.length);
55+
}
56+
return actual === expected;
57+
};
58+
return assert;
59+
}

‎lib/helper/Playwright.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import assert from 'assert';
66
import promiseRetry from 'promise-retry';
77
import Locator from '../locator.js';
88
import recorder from '../recorder.js';
9-
import { includes as stringIncludes } from '../assert/include.js';
9+
import * as stringIncludes from '../assert/include.js';
1010
import { urlEquals, equals } from '../assert/equal.js';
11-
import { empty } from '../assert/empty.js';
12-
import { truth } from '../assert/truth';
11+
import * as empty from '../assert/empty.js';
12+
import { truth } from '../assert/truth.js';
1313

1414
import {
1515
xpathLocator,
@@ -25,33 +25,31 @@ import {
2525
normalizeSpacesInString,
2626
} from '../utils.js';
2727

28-
import { isColorProperty, convertColorToRGBA } from '../colorUtils';
28+
import { isColorProperty, convertColorToRGBA } from '../colorUtils.js';
2929
import ElementNotFound from './errors/ElementNotFound.js';
30-
import RemoteBrowserConnectionRefused from './errors/RemoteBrowserConnectionRefused';
31-
import Popup from './extras/Popup';
32-
import Console from './extras/Console';
33-
import { findReact, findVue } from './extras/PlaywrightReactVueLocator';
30+
import RemoteBrowserConnectionRefused from './errors/RemoteBrowserConnectionRefused.js';
31+
import Popup from './extras/Popup.js';
32+
import Console from './extras/Console.js';
33+
import { findReact, findVue } from './extras/PlaywrightReactVueLocator.js';
3434

3535
import {
3636
setRestartStrategy, restartsSession, restartsContext, restartsBrowser,
37-
} from './extras/PlaywrightRestartOpts';
38-
import { createValueEngine, createDisabledEngine } from './extras/PlaywrightPropEngine';
37+
} from './extras/PlaywrightRestartOpts.js';
38+
import { createValueEngine, createDisabledEngine } from './extras/PlaywrightPropEngine.js';
3939

4040
import {
4141
seeElementError,
4242
dontSeeElementError,
4343
dontSeeElementInDOMError,
4444
seeElementInDOMError,
45-
} from './errors/ElementAssertion';
45+
} from './errors/ElementAssertion.js';
4646

4747
import {
4848
createAdvancedTestResults,
4949
allParameterValuePairsMatchExtreme,
5050
extractQueryObjects,
5151
} from './networkTraffics/utils.js';
5252

53-
import { log } from '../output.js';
54-
5553
let playwright;
5654
let perfTiming;
5755
let defaultSelectorEnginesInitialized = false;

‎lib/helper/Protractor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
screenshotOutputFolder,
1313
} from '../utils.js';
1414

15-
import { isColorProperty, convertColorToRGBA } from '../colorUtils';
15+
import { isColorProperty, convertColorToRGBA } from '../colorUtils.js';
1616
import ElementNotFound from './errors/ElementNotFound.js';
1717
import ConnectionRefused from './errors/ConnectionRefused.js';
1818
import Locator from '../locator.js';

‎lib/helper/Puppeteer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
normalizeSpacesInString,
3030
} from '../utils.js';
3131

32-
import { isColorProperty, convertColorToRGBA } from '../colorUtils';
32+
import { isColorProperty, convertColorToRGBA } from '../colorUtils.js';
3333
import ElementNotFound from './errors/ElementNotFound.js';
3434
import RemoteBrowserConnectionRefused from './errors/RemoteBrowserConnectionRefused';
3535
import Popup from './extras/Popup';
@@ -44,7 +44,7 @@ import {
4444
seeElementError,
4545
dontSeeElementInDOMError,
4646
seeElementInDOMError,
47-
} from './errors/ElementAssertion';
47+
} from './errors/ElementAssertion.js';
4848

4949
let puppeteer;
5050
let perfTiming;

‎lib/helper/WebDriver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
modifierKeys,
2222
} from '../utils.js';
2323

24-
import { isColorProperty, convertColorToRGBA } from '../colorUtils';
24+
import { isColorProperty, convertColorToRGBA } from '../colorUtils.js';
2525
import ElementNotFound from './errors/ElementNotFound.js';
2626
import ConnectionRefused from './errors/ConnectionRefused.js';
2727
import Locator from '../locator.js';
@@ -35,7 +35,7 @@ import {
3535
seeElementError,
3636
seeElementInDOMError,
3737
dontSeeElementInDOMError,
38-
} from './errors/ElementAssertion';
38+
} from './errors/ElementAssertion.js';
3939

4040
import {
4141
allParameterValuePairsMatchExtreme,

‎lib/helper/errors/ElementAssertion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function dontSeeElementInDOMError(locator) {
3030
throw new Error(`${prefixMessage} "${(new Locator(locator))}" is not seen in DOM.`);
3131
}
3232

33-
export default {
33+
export {
3434
seeElementError,
3535
dontSeeElementError,
3636
seeElementInDOMError,

‎lib/helper/extras/PlaywrightReactVueLocator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ function propBuilder(props) {
3535
return _props;
3636
}
3737

38-
export default { findReact, findVue };
38+
export { findReact, findVue };

‎lib/helper/extras/PlaywrightRestartOpts.js

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@ const RESTART_OPTS = {
66

77
let restarts = null;
88

9-
export default {
10-
11-
setRestartStrategy(options) {
12-
const { restart } = options;
13-
const stringOpts = Object.keys(RESTART_OPTS);
14-
15-
if (stringOpts.includes(restart)) {
16-
return restarts = restart;
17-
}
18-
19-
restarts = Object.keys(RESTART_OPTS).find(key => RESTART_OPTS[key] === restart);
20-
21-
if (restarts === null || restarts === undefined) throw new Error('No restart strategy set, use the following values for restart: session, context, browser');
22-
},
23-
24-
restartsSession() {
25-
return restarts === 'session';
26-
},
27-
restartsContext() {
28-
return restarts === 'context';
29-
},
30-
restartsBrowser() {
31-
return restarts === 'browser';
32-
},
33-
};
9+
export function setRestartStrategy(options) {
10+
const { restart } = options;
11+
const stringOpts = Object.keys(RESTART_OPTS);
12+
13+
if (stringOpts.includes(restart)) {
14+
return restarts = restart;
15+
}
16+
17+
restarts = Object.keys(RESTART_OPTS).find(key => RESTART_OPTS[key] === restart);
18+
19+
if (restarts === null || restarts === undefined) throw new Error('No restart strategy set, use the following values for restart: session, context, browser');
20+
}
21+
22+
export function restartsSession() {
23+
return restarts === 'session';
24+
}
25+
26+
export function restartsContext() {
27+
return restarts === 'context';
28+
}
29+
30+
export function restartsBrowser() {
31+
return restarts === 'browser';
32+
}

‎lib/helper/networkTraffics/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const allRequestPostDataValuePairsMatchExtreme = (RequestPostDataObject, advance
129129
return success ? true : littleReport;
130130
};
131131

132-
export default {
132+
export {
133133
createAdvancedTestResults,
134134
extractQueryObjects,
135135
allParameterValuePairsMatchExtreme,

‎lib/utils.js

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -180,25 +180,22 @@ export const xpathLocator = {
180180
combine: locators => locators.join(' | '),
181181
};
182182

183-
export default {
184-
submittedData(dataFile) {
185-
return function (key) {
186-
if (!fs.existsSync(dataFile)) {
187-
const waitTill = new Date(new Date().getTime() + 1 * 1000); // wait for one sec for file to be created
188-
while (waitTill > new Date()) {} // eslint-disable-line no-empty
189-
}
190-
if (!fs.existsSync(dataFile)) {
191-
throw new Error('Data file was not created in time');
192-
}
193-
const data = JSON.parse(fs.readFileSync(dataFile, 'utf8'));
194-
if (key) {
195-
return data.form[key];
196-
}
197-
return data;
198-
};
199-
},
200-
201-
};
183+
export function submittedData(dataFile) {
184+
return function (key) {
185+
if (!fs.existsSync(dataFile)) {
186+
const waitTill = new Date(new Date().getTime() + 1 * 1000); // wait for one sec for file to be created
187+
while (waitTill > new Date()) {} // eslint-disable-line no-empty
188+
}
189+
if (!fs.existsSync(dataFile)) {
190+
throw new Error('Data file was not created in time');
191+
}
192+
const data = JSON.parse(fs.readFileSync(dataFile, 'utf8'));
193+
if (key) {
194+
return data.form[key];
195+
}
196+
return data;
197+
};
198+
}
202199

203200
export function grepLines(array, startString, endString) {
204201
let startIndex = 0;
@@ -482,4 +479,4 @@ export const normalizeSpacesInString = (string) => {
482479

483480
export function stripAnsi(string) {
484481
return string.replace(/\u001b\[.*?m/g, '');
485-
};
482+
}

0 commit comments

Comments
 (0)