web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow specifying the browser in selenium

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-12-18 11:39:59 +01:00
parent 6a2d79249d
commit e587e9cd57
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TestSelenium.js
View File

@@ -20,7 +20,9 @@ if (process.env.SAUCE_USERNAME !== undefined) {
"accessKey": process.env.SAUCE_ACCESS_KEY, "accessKey": process.env.SAUCE_ACCESS_KEY,
}).forBrowser(browserArray[0], browserArray[1], browserArray[2]).build(); }).forBrowser(browserArray[0], browserArray[1], browserArray[2]).build();
} else { } else {
driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build(); driver = new WebDriver.Builder().withCapabilities({
browserName: process.env.BROWSER || "chrome"
}).build();
} }
var SC_GET_DATA = "return (window.__CRYPTPAD_TEST__) ? window.__CRYPTPAD_TEST__.getData() : '[]'"; var SC_GET_DATA = "return (window.__CRYPTPAD_TEST__) ? window.__CRYPTPAD_TEST__.getData() : '[]'";

4
www/common/sframe-app-framework.js
View File

@@ -291,11 +291,11 @@ define([
common.openTemplatePicker(); common.openTemplatePicker();
} }
if (Test.testing) { Test(function () {
cpNfInner.chainpad.onSettle(function () { cpNfInner.chainpad.onSettle(function () {
Test.passed(); Test.passed();
}); });
} });
}; };
var onConnectionChange = function (info) { var onConnectionChange = function (info) {
stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED); stateChange(info.state ? STATE.INITIALIZING : STATE.DISCONNECTED);