Skip to content

Commit 5235e3a

Browse files
committed
ci: Enable Edge, IE11 and IE10 and SauceLabs
1 parent 1295d86 commit 5235e3a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Gruntfile.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ module.exports = function(grunt) {
205205
'http://127.0.0.1:9999/test/integration/index.html'
206206
],
207207
sauceConfig: {
208-
'record-video': false,
209-
'record-screenshots': false
208+
'record-video': false
210209
},
211210
build: process.env.TRAVIS_BUILD_NUMBER,
212211
// On average, our integration tests take 60s to run
@@ -224,18 +223,22 @@ module.exports = function(grunt) {
224223
// Already notified SauceLabs support about this issue
225224
// ['Windows 10', 'microsoftedge', 'latest'],
226225

227-
// Commenting out until we fix initial issues
228-
// ['Windows 10', 'microsoftedge', 'latest-1'],
229-
// ['Windows 10', 'internet explorer', '11'],
230-
226+
['Windows 10', 'microsoftedge', 'latest-1'],
227+
['Windows 10', 'internet explorer', '11'],
228+
['Windows 7', 'internet explorer', '11'],
229+
['Windows 7', 'internet explorer', '10'],
231230
['Windows 10', 'chrome', 'latest'],
232231
['Windows 10', 'firefox', 'latest'],
233232
['macOS 10.12', 'safari', '10'],
234233
['macOS 10.12', 'chrome', 'latest'],
235234
['macOS 10.12', 'firefox', 'latest']
236235
],
237236
public: 'public',
238-
tunnelArgs: ['--verbose']
237+
tunnelArgs: ['--verbose'],
238+
onTestComplete: function(result, callback) {
239+
console.log(result);
240+
callback(null);
241+
}
239242
}
240243
}
241244
},

test/integration/test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ function isEdge14() {
4444
}
4545

4646
describe('integration', function() {
47+
this.timeout(10000);
48+
4749
beforeEach(function(done) {
4850
this.iframe = createIframe(done);
4951
});

0 commit comments

Comments
 (0)