Skip to content

Commit f0590e1

Browse files
joeltinejoeltine
committed
Fix IE tests on sauce labs
1 parent 4dd12d6 commit f0590e1

5 files changed

+88
-9
lines changed

‎protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports.config = {
1919
specs: ['protractor_spec.js'],
2020

2121
jasmineNodeOpts: {
22-
// Timeout in ms before a test fails. 30 minutes.
22+
// Timeout in ms before a test fails.
2323
defaultTimeoutInterval: 30 * 60 * 1000
2424
}
2525
};

‎protractor_spec.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ var allTests = require('./alltests');
66
// Timeout for individual test package to complete.
77
var TEST_TIMEOUT = 45 * 1000;
88
var TEST_SERVER = 'http://localhost:8080';
9-
var IGNORED_TESTS = ['closure/goog/i18n/currency_test.html'];
9+
var IGNORED_TESTS = [
10+
// currency_test has some weird encoding issues when run with the rest of
11+
// the test suite.
12+
'closure/goog/i18n/currency_test.html',
13+
// Test hangs in IE8.
14+
'closure/goog/ui/plaintextspellchecker_test.html'
15+
];
1016

1117
describe('Run all Closure unit tests', function() {
1218
var removeIgnoredTests = function(tests) {
@@ -19,9 +25,7 @@ describe('Run all Closure unit tests', function() {
1925
return tests;
2026
};
2127

22-
beforeAll(function() {
23-
allTests = removeIgnoredTests(allTests);
24-
});
28+
beforeAll(function() { allTests = removeIgnoredTests(allTests); });
2529

2630
beforeEach(function() {
2731
// Ignores synchronization with angular loading. Since we don't use angular,

‎sauce_browsers.json

+34-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,42 @@
11
[
22
{
3-
"browserName" : "chrome",
3+
"browserName" : "firefox",
44
"platform" : "Linux"
55
},
66
{
7-
"browserName" : "firefox",
7+
"browserName" : "chrome",
88
"platform" : "Linux"
9+
},
10+
{
11+
"browserName" : "internet explorer",
12+
"version" : "11.0",
13+
"platform" : "Windows 7",
14+
"prerun": {
15+
"executable": "https://raw.githubusercontent.com/google/closure-library/master/scripts/ci/ie_setup.bat"
16+
}
17+
},
18+
{
19+
"browserName" : "internet explorer",
20+
"version" : "10.0",
21+
"platform" : "Windows 7",
22+
"prerun": {
23+
"executable": "https://raw.githubusercontent.com/google/closure-library/master/scripts/ci/ie_setup.bat"
24+
}
25+
},
26+
{
27+
"browserName" : "internet explorer",
28+
"version" : "9.0",
29+
"platform" : "Windows 7",
30+
"prerun": {
31+
"executable": "https://raw.githubusercontent.com/google/closure-library/master/scripts/ci/ie_setup.bat"
32+
}
33+
},
34+
{
35+
"browserName" : "internet explorer",
36+
"version" : "8.0",
37+
"platform" : "Windows 7",
38+
"prerun": {
39+
"executable": "https://raw.githubusercontent.com/google/closure-library/master/scripts/ci/ie_setup.bat"
40+
}
941
}
1042
]

‎scripts/ci/ie_setup.bat

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
:: Disable "Stop running this script?" alert dialog.
2+
reg add "HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Styles" ^
3+
/v "MaxScriptStatements" /t REG_DWORD /d 0xffffffff /f
4+
5+
:: Disable Java update dialogs.
6+
reg add ^
7+
"HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Update\Policy" ^
8+
reg add ^
9+
"HKEY_LOCAL_MACHINE\Software\JavaSoft\Java Update\Policy" ^
10+
/v "EnableJavaUpdate" /t REG_DWORD /d 0 /f
11+
reg add ^
12+
"HKEY_CURRENT_USER\Software\AppDataLow\Software\JavaSoft\DeploymentProperties" ^
13+
/v "deployment.expiration.check.enabled" /t REG_SZ /d false /f
14+
reg add ^
15+
"HKEY_CURRENT_USER\Software\AppDataLow\Software\JavaSoft\DeploymentProperties" ^
16+
/v "deployment.expiration.decision.10.55.2" /t REG_SZ /d block /f
17+
reg add ^
18+
"HKEY_CURRENT_USER\Software\AppDataLow\Software\JavaSoft\DeploymentProperties" ^
19+
/v "deployment.expiration.decision.suppression.10.55.2" /t REG_SZ /d true /f
20+
reg add ^
21+
"HKEY_CURRENT_USER\Software\AppDataLow\Software\JavaSoft\DeploymentProperties" ^
22+
/v "deployment.expiration.decision.timestamp.10.55.2" /t REG_SZ /d 1413180896 /f
23+
reg add ^
24+
"HKEY_CURRENT_USER\Software\Microsoft\Active Setup\Declined Install On Demand IEv5" ^
25+
/v "{08B0e5c0-4FCB-11CF-AAA5-00401C608501}" /t REG_SZ /d 1 /f /v "EnableJavaUpdate" /t REG_DWORD /d 0 /f
26+
27+
:: Disable Windows crash dialogs.
28+
reg add ^
29+
"HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\Windows Error Reporting" ^
30+
/v "DontShowUI" /t REG_DWORD /d 1 /f
31+
reg add ^
32+
"HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\Windows Error Reporting" ^
33+
/v "ForceQueue" /t REG_DWORD /d 1 /f
34+
35+
:: Disable JavaScript error dialogs.
36+
reg add "HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Main" ^
37+
/v "Error Dlg Displayed On Every Error" /t REG_SZ /d no /f
38+
39+
:: Disable script error dialogs for IE8 & IE9.
40+
reg add "HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Main" ^
41+
/v "Disable Script Debugger" /t REG_SZ /d yes /f
42+
reg add "HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Main" ^
43+
/v "DisableScriptDebuggerIE" /t REG_SZ /d yes /f

‎scripts/ci/sauce_connect.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
set -e -o pipefail
44

55
# Setup and start Sauce Connect for your TravisCI build
6-
76
CONNECT_URL="https://saucelabs.com/downloads/sc-4.3.11-linux.tar.gz"
87
CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
98
CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
@@ -38,8 +37,9 @@ echo "Starting Sauce Connect in the background, logging into:"
3837
echo " $CONNECT_LOG"
3938
echo " $CONNECT_STDOUT"
4039
echo " $CONNECT_STDERR"
40+
# -B java.com helps to disable Java update popups in IE.
4141
sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
42-
--logfile $CONNECT_LOG &
42+
--logfile $CONNECT_LOG -B java.com &
4343

4444
# Wait for Connect to be ready before exiting
4545
printf "Connecting to Sauce."

0 commit comments

Comments
 (0)