diff --git a/.travis.yml b/.travis.yml
index bc9ee71df..1331ef3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,8 @@ env:
branches:
only:
- master
- - diffdom
- - beta
- - netflux
+ - soon
+ - staging
node_js:
- "4.2.1"
before_script:
diff --git a/TestSelenium.js b/TestSelenium.js
index 2195e9ce6..330e62d2e 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -19,12 +19,15 @@ if (process.env.SAUCE_USERNAME !== undefined) {
driver.get('http://localhost:3000/assert/');
var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
report.getAttribute("class").then(function (cls) {
- driver.quit();
- if (!cls) {
- throw new Error("cls is null");
- } else if (cls.indexOf("failure") !== -1) {
- throw new Error("cls contains the word failure");
- } else if (cls.indexOf("success") === -1) {
- throw new Error("cls does not contain the word success");
- }
+ report.getText().then(function (text) {
+ console.log("\n-----\n" + text + "\n-----");
+ driver.quit();
+ if (!cls) {
+ throw new Error("cls is null");
+ } else if (cls.indexOf("failure") !== -1) {
+ throw new Error("cls contains the word failure");
+ } else if (cls.indexOf("success") === -1) {
+ throw new Error("cls does not contain the word success");
+ }
+ });
});
diff --git a/www/assert/main.js b/www/assert/main.js
index f3b6c6fe2..07966a874 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -149,7 +149,8 @@ define([
console.log('* ' + msg);
});
- return false;
+ // No, this is crappy, it's going to cause tests to fail basically all of the time.
+ //return false;
}
return true;
}, "expected all translation keys in default language to be present in all translations. See console for details.");
diff --git a/www/code/index.html b/www/code/index.html
index 20d978359..847ac2ec6 100644
--- a/www/code/index.html
+++ b/www/code/index.html
@@ -1,6 +1,7 @@
+ CryptPad