summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliabru <liabru@brm.io>2015-12-25 13:01:13 +0000
committerliabru <liabru@brm.io>2015-12-25 13:01:13 +0000
commitd67ca251651280fc3a72d65ff482b2d612424626 (patch)
treef859a3329f561f225d27048ba4b932e96b906b1e
parent1195421c79b2d32e1dad7b8f68b2c3b9cd164143 (diff)
downloadjquery-match-height-d67ca251651280fc3a72d65ff482b2d612424626.zip
jquery-match-height-d67ca251651280fc3a72d65ff482b2d612424626.tar.gz
jquery-match-height-d67ca251651280fc3a72d65ff482b2d612424626.tar.bz2
fixed local test config for non-windows
-rw-r--r--test/conf/local.conf.js24
1 files changed, 15 insertions, 9 deletions
diff --git a/test/conf/local.conf.js b/test/conf/local.conf.js
index d6c5352..a91817b 100644
--- a/test/conf/local.conf.js
+++ b/test/conf/local.conf.js
@@ -1,4 +1,5 @@
var testUrl = '/test/page/test.html',
+ hasIE = /^win/.test(process.platform),
viewports = [[1280, 1024], [640, 480], [320, 640]];
var capabilities = [
@@ -7,18 +8,23 @@ var capabilities = [
},
{
browserName: 'firefox'
- },
- {
- browserName: 'internet explorer',
- urls: [testUrl, testUrl + '?ie=9', testUrl + '?ie=10'],
- },
- {
- browserName: 'internet explorer',
- urls: [testUrl + '?ie=8'],
- viewports: [[1280, 1024]]
}
];
+if (hasIE) {
+ capabilities = capabilities.concat([
+ {
+ browserName: 'internet explorer',
+ urls: [testUrl, testUrl + '?ie=9', testUrl + '?ie=10']
+ },
+ {
+ browserName: 'internet explorer',
+ urls: [testUrl + '?ie=8'],
+ viewports: [[1280, 1024]]
+ }
+ ]);
+}
+
for (var i = 0; i < capabilities.length; i += 1) {
var capability = capabilities[i];
capability['urls'] = capability['urls'] || [testUrl];