Merge branch 'master' into chore/skip-macaddress-globals

TheLarkInn · web-flow · commit 84ba3c4cb214 · 2016-10-26T14:10:48.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 /coverage
 .DS_Store
 *.log
-.idea
+.idea
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ env:
 install:
   - npm install yarn -g
   - yarn install
-  - if [ ! -h "$HOME/.yarn-cache/.link/webpack" ]; then yarn link; fi
+  - yarn link || true
   - yarn link webpack
 
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ environment:
 install:
   - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
   - npm install yarn -g
-  - yarn install --msvs_version=2013
+  - yarn install
   - yarn link
   - yarn link webpack
 
diff --git a/test/RuleSet.test.js b/test/RuleSet.test.js
@@ -270,12 +270,12 @@ describe("RuleSet", function() {
 	});
 	describe('when exclude array holds an undefined item', function() {
 		function errorHasContext(err) {
-			if (/Expected condition but got falsy value/.test(err)
-				&& /test/.test(err)
-				&& /include/.test(err)
-				&& /exclude/.test(err)
-				&& /node_modules/.test(err)
-				&& /undefined/.test(err)) {
+			if(/Expected condition but got falsy value/.test(err) &&
+				/test/.test(err) &&
+				/include/.test(err) &&
+				/exclude/.test(err) &&
+				/node_modules/.test(err) &&
+				/undefined/.test(err)) {
 				return true;
 			}
 		}
diff --git a/yarn.lock b/yarn.lock
