diff --git a/grunt/sauce.js b/grunt/sauce.js index 20cbe0ed3..afccd417f 100644 --- a/grunt/sauce.js +++ b/grunt/sauce.js @@ -64,7 +64,7 @@ var batches = [ base: 'SauceLabs', browserName: 'android', platform: 'Linux', - version: '4.4' + version: '4.2' } } ] @@ -72,7 +72,9 @@ var batches = [ for (var i = 0; i < 3; i++) { exports['batch' + (i+1)] = { sauceLabs: sauceConfig, - captureTimeout: 600000, + // mobile emulators are really slow + captureTimeout: 300000, + browserNoActivityTimeout: 300000, customLaunchers: batches[i], browsers: Object.keys(batches[i]), reporters: ['progress', 'saucelabs'] diff --git a/test/unit/specs/api/global_spec.js b/test/unit/specs/api/global_spec.js index 2bfc9c9c4..9f5ce0ddb 100644 --- a/test/unit/specs/api/global_spec.js +++ b/test/unit/specs/api/global_spec.js @@ -19,7 +19,8 @@ describe('Global API', function () { expect(Test.options.a).toBe(1) expect(Test.options.b).toBe(2) expect(Test.super).toBe(Vue) - expect(Test.name).toBe('Test') + // function.name is not available in IE + expect(Test.toString().match(/^function Test\s?\(/)).toBeTruthy() var t = new Test({ a: 2 })