sefiutils 1.0.23 → 1.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/localSetup.d.ts +1 -1
- package/lib/localSetup.d.ts.map +1 -1
- package/lib/localSetup.js +21 -15
- package/lib/localSetup.js.map +1 -1
- package/package.json +1 -1
package/lib/localSetup.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { WebDriver } from "selenium-webdriver";
|
|
2
2
|
export declare const LOCAL_SETUP_TIMEOUT = 20000;
|
|
3
|
-
export declare function localSetup(page: string, width?: number, height?: number): Promise<WebDriver>;
|
|
3
|
+
export declare function localSetup(page: string, width?: number, height?: number, acceptUntrustedCertificates?: boolean): Promise<WebDriver>;
|
|
4
4
|
//# sourceMappingURL=localSetup.d.ts.map
|
package/lib/localSetup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSetup.d.ts","sourceRoot":"","sources":["../src/localSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGtE,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,EAAE,MAAM,SAAM,GAAG,OAAO,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"localSetup.d.ts","sourceRoot":"","sources":["../src/localSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGtE,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,EAAE,MAAM,SAAM,EAAE,2BAA2B,UAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAMhI"}
|
package/lib/localSetup.js
CHANGED
|
@@ -36,9 +36,9 @@ exports.localSetup = exports.LOCAL_SETUP_TIMEOUT = void 0;
|
|
|
36
36
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
37
37
|
const seUtils_1 = require("./seUtils");
|
|
38
38
|
exports.LOCAL_SETUP_TIMEOUT = 20000;
|
|
39
|
-
function localSetup(page, width = 500, height = 500) {
|
|
39
|
+
function localSetup(page, width = 500, height = 500, acceptUntrustedCertificates = true) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
|
-
const driver = yield getWebDriver();
|
|
41
|
+
const driver = yield getWebDriver(acceptUntrustedCertificates);
|
|
42
42
|
console.log(`Load page: ${page}`);
|
|
43
43
|
yield driver.get(page);
|
|
44
44
|
yield (0, seUtils_1.setBrowserWindowSize)(driver, width, height);
|
|
@@ -55,19 +55,19 @@ exports.localSetup = localSetup;
|
|
|
55
55
|
* ```
|
|
56
56
|
* are to be called.
|
|
57
57
|
*/
|
|
58
|
-
function getWebDriver() {
|
|
58
|
+
function getWebDriver(acceptUntrustedCertificates) {
|
|
59
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const browser = process.env.BROWSER || "remote";
|
|
61
61
|
// console.log(`Using browser: ${browser}`);
|
|
62
62
|
try {
|
|
63
63
|
if (browser === "chrome") {
|
|
64
|
-
return yield setUpWebDriverChrome();
|
|
64
|
+
return yield setUpWebDriverChrome(acceptUntrustedCertificates);
|
|
65
65
|
}
|
|
66
66
|
else if (browser === "firefox") {
|
|
67
|
-
return yield setUpWebDriverFirefox();
|
|
67
|
+
return yield setUpWebDriverFirefox(acceptUntrustedCertificates);
|
|
68
68
|
}
|
|
69
69
|
else if (browser === "remote") {
|
|
70
|
-
return yield setUpWebDriverInDocker();
|
|
70
|
+
return yield setUpWebDriverInDocker(acceptUntrustedCertificates);
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
73
|
throw new Error(`Unknown browser: ${browser}`);
|
|
@@ -79,17 +79,19 @@ function getWebDriver() {
|
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
|
-
function setUpWebDriverInDocker() {
|
|
82
|
+
function setUpWebDriverInDocker(acceptUntrustedCertificates) {
|
|
83
83
|
return __awaiter(this, void 0, void 0, function* () {
|
|
84
84
|
const firefox = yield Promise.resolve().then(() => __importStar(require('selenium-webdriver/firefox')));
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
const address = "http://localhost:4444/wd/hub";
|
|
86
|
+
// const start = Date.now();
|
|
87
|
+
const options = new firefox.Options().headless();
|
|
88
|
+
options.setAcceptInsecureCerts(acceptUntrustedCertificates);
|
|
87
89
|
const driver = yield new selenium_webdriver_1.Builder()
|
|
88
90
|
.usingServer(address)
|
|
89
91
|
.withCapabilities(selenium_webdriver_1.Capabilities.firefox())
|
|
90
|
-
.setFirefoxOptions(
|
|
92
|
+
.setFirefoxOptions(options)
|
|
91
93
|
.build();
|
|
92
|
-
|
|
94
|
+
// const duration = (Date.now() - start) / 1000;
|
|
93
95
|
// console.log(`Driver resolved and connected to ${address}, required ${duration}s.`);
|
|
94
96
|
return driver;
|
|
95
97
|
});
|
|
@@ -103,14 +105,16 @@ function setUpWebDriverInDocker() {
|
|
|
103
105
|
* ```
|
|
104
106
|
* are to be called.
|
|
105
107
|
*/
|
|
106
|
-
function setUpWebDriverChrome() {
|
|
108
|
+
function setUpWebDriverChrome(acceptUntrustedCertificates) {
|
|
107
109
|
return __awaiter(this, void 0, void 0, function* () {
|
|
108
110
|
//@ts-ignore
|
|
109
111
|
yield Promise.resolve().then(() => __importStar(require('chromedriver')));
|
|
110
112
|
const chrome = yield Promise.resolve().then(() => __importStar(require('selenium-webdriver/chrome')));
|
|
113
|
+
const options = new chrome.Options().headless();
|
|
114
|
+
options.setAcceptInsecureCerts(acceptUntrustedCertificates);
|
|
111
115
|
const driver = yield new selenium_webdriver_1.Builder()
|
|
112
116
|
.forBrowser('chrome')
|
|
113
|
-
.setChromeOptions(
|
|
117
|
+
.setChromeOptions(options)
|
|
114
118
|
.build();
|
|
115
119
|
return driver;
|
|
116
120
|
});
|
|
@@ -124,14 +128,16 @@ function setUpWebDriverChrome() {
|
|
|
124
128
|
* ```
|
|
125
129
|
* are to be called.
|
|
126
130
|
*/
|
|
127
|
-
function setUpWebDriverFirefox() {
|
|
131
|
+
function setUpWebDriverFirefox(acceptUntrustedCertificates) {
|
|
128
132
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
133
|
//@ts-ignore
|
|
130
134
|
yield Promise.resolve().then(() => __importStar(require('geckodriver'))); // installed geckodriver will cause remote configuration to fail in docker...
|
|
131
135
|
const firefox = yield Promise.resolve().then(() => __importStar(require('selenium-webdriver/firefox')));
|
|
136
|
+
const options = new firefox.Options().headless();
|
|
137
|
+
options.setAcceptInsecureCerts(acceptUntrustedCertificates);
|
|
132
138
|
const driver = yield new selenium_webdriver_1.Builder()
|
|
133
139
|
.forBrowser('firefox')
|
|
134
|
-
.setFirefoxOptions(
|
|
140
|
+
.setFirefoxOptions(options)
|
|
135
141
|
.build();
|
|
136
142
|
return driver;
|
|
137
143
|
});
|
package/lib/localSetup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSetup.js","sourceRoot":"","sources":["../src/localSetup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAsE;AACtE,uCAAkE;AAErD,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC,SAAsB,UAAU,CAAC,IAAY,EAAE,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG;;
|
|
1
|
+
{"version":3,"file":"localSetup.js","sourceRoot":"","sources":["../src/localSetup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED