Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 18:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor style tweaks and simplify travis.yml.

Browse Source
This commit is contained in:
John-David Dalton
2013-11-05 08:58:19 -08:00
parent 7940428b9b
commit 3d3c59cea6
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -52,8 +52,8 @@ branches:
only: only:
- master - master
before_install: before_install:
- "[ $BUILD != false ] && [ $BUILD != 'compat' ] && MAKE=true || true" - "([ $BUILD == 'legacy' ] || [ $BUILD == 'mobile' ] || [ $BUILD == 'modern' ]) && MAKE=true || true"
- "[ $BUILD != 'mobile' ] && [ $BUILD != 'modern' ] && COMPAT=true || true" - "([ $BUILD == 'compat' ] || [ $BUILD == 'legacy' ]) && COMPAT=true || true"
- "[ $SAUCE_LABS != false ] && npm i ecstatic@\"~0.4.0\" request@\"~2.27.0\" sauce-tunnel@\"~1.1.0\" || true" - "[ $SAUCE_LABS != false ] && npm i ecstatic@\"~0.4.0\" request@\"~2.27.0\" sauce-tunnel@\"~1.1.0\" || true"
- "[ $BIN == 'istanbul' ] && npm i -g istanbul@\"~0.1.0\" || true" - "[ $BIN == 'istanbul' ] && npm i -g istanbul@\"~0.1.0\" || true"
- "[ $BIN == 'narwhal' ] && wget https://github.com/280north/narwhal/archive/v0.3.2.zip && sudo unzip v0.3.2 -d /opt/ && rm v0.3.2.zip || true" - "[ $BIN == 'narwhal' ] && wget https://github.com/280north/narwhal/archive/v0.3.2.zip && sudo unzip v0.3.2 -d /opt/ && rm v0.3.2.zip || true"
@@ -76,5 +76,5 @@ script:
- "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=../dist/lodash.$BUILD.js\"" - "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=../dist/lodash.$BUILD.js\""
- "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-$BUILD\"" - "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-$BUILD\""
- "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=../dist/lodash.$BUILD.js\"" - "[ $SAUCE_LABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=../dist/lodash.$BUILD.js\""
- "([ $SAUCE_LABS == false ] || [ $BUILD == 'underscore' ] || [ $COMPAT == false ]) && true || node ./test/saucelabs.js \"test/index.html?build=lodash-$BUILD&compat=7\"" - "([ $SAUCE_LABS == false ] || [ $COMPAT == false ]) && true || node ./test/saucelabs.js \"test/index.html?build=lodash-$BUILD&compat=7\""
- "([ $SAUCE_LABS == false ] || [ $BUILD == 'underscore' ] || [ $COMPAT == false ]) && true || node ./test/saucelabs.js \"test/index.html?build=../dist/lodash.$BUILD.js&compat=7\"" - "([ $SAUCE_LABS == false ] || [ $COMPAT == false ]) && true || node ./test/saucelabs.js \"test/index.html?build=../dist/lodash.$BUILD.js&compat=7\""

9
test/saucelabs.js
View File

@@ -51,7 +51,7 @@
['Windows 7', 'safari', '5'] ['Windows 7', 'safari', '5']
]; ];
// test IE compat mode // platforms to test IE compat mode
if (runnerQuery.compat) { if (runnerQuery.compat) {
platforms = [ platforms = [
['WIN8.1', 'internet explorer', '11'], ['WIN8.1', 'internet explorer', '11'],
@@ -86,13 +86,12 @@
// create a web server for the local dir // create a web server for the local dir
var mount = ecstatic({ var mount = ecstatic({
root: process.cwd(), 'root': process.cwd(),
cache: false 'cache': false
}); });
http.createServer(function(req, res) { http.createServer(function(req, res) {
var parsedUrl = url.parse(req.url, true); var compat = url.parse(req.url, true).query.compat;
var compat = parsedUrl.query.compat;
if (compat) { if (compat) {
// see http://msdn.microsoft.com/en-us/library/ff955275(v=vs.85).aspx // see http://msdn.microsoft.com/en-us/library/ff955275(v=vs.85).aspx
res.setHeader('X-UA-Compatible', 'IE=' + compat); res.setHeader('X-UA-Compatible', 'IE=' + compat);