theluyuan/layui-js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sentsin/layui

Browse Source 
merge
This commit is contained in:
sentsin 2017-11-27 23:45:19 +08:00
commit 34ad6acf9c
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
karma.conf.sauce.js
View File

@ -13,16 +13,16 @@ var customLaunchers = {
}, },
// 安卓浏览器 // 安卓浏览器
sl_android_4_4: { // sl_android_4_4: {
base: 'SauceLabs', // base: 'SauceLabs',
browserName: 'android', // browserName: 'android',
version: '4.4' // version: '4.4'
}, // },
sl_android_5: { // sl_android_5: {
base: 'SauceLabs', // base: 'SauceLabs',
browserName: 'android', // browserName: 'android',
version: '5' // version: '5'
}, // },
sl_android_6: { sl_android_6: {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'android', browserName: 'android',
@ -43,34 +43,29 @@ var customLaunchers = {
sl_ie_9: { sl_ie_9: {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'Windows 7',
version: '9' version: '9'
}, },
sl_ie_10: { sl_ie_10: {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'Windows 8',
version: '10' version: '10'
}, },
sl_ie_11: { sl_ie_11: {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11' version: '11'
}, },
sl_edga: { sl_edga: {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'microsoftedge', browserName: 'microsoftedge',
platform: 'Windows 10', // platform: 'Windows 10'
version: '15'
}, },
sl_firefox: { // sl_firefox: {
base: 'SauceLabs', // base: 'SauceLabs',
browserName: 'firefox', // browserName: 'firefox'
platform: 'Windows 7' // }
}
}; };
// 不支持本地运行 // 不支持本地运行
@ -105,7 +100,9 @@ module.exports = function (config) {
customLaunchers: customLaunchers, customLaunchers: customLaunchers,
browsers: Object.keys(customLaunchers), browsers: Object.keys(customLaunchers),
captureTimeout: 1000 * 60 * 5, captureTimeout: 1000 * 60 * 5,
browserNoActivityTimeout: 1000 * 60 * 5 browserNoActivityTimeout: 1000 * 60 * 5,
browserDisconnectTolerance: 3,
browserDisconnectTimeout: 10000
}); });
config.set(options); config.set(options);