Merge pull request #294 from Automattic/fix/run-integration-tests-in-CI

Run integration tests in CI
Automattic · Dec 4, 2018 · 6ee2440 · 6ee2440
2 parents c995a4e + 114e769
commit 6ee2440
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ script:
   - ./bin/unit-tests
 
   # Run integration test.
-  - if [[ "$INTEGRATION_TEST" == "1" ]]; then ./bin/integration-test; fi
+  - ./bin/integration-test
 
 # Rather than a `matrix` property, we use build stages. This allows early
 # build failure for basic linting and sniffing issues.

diff --git a/ruleset_test.php b/ruleset_test.php
@@ -27,7 +27,6 @@
 		24  => 1,
 		40  => 1,
 		43  => 1,
-		45  => 1,
 		48  => 1,
 		49  => 1,
 		53  => 1,
@@ -60,6 +59,7 @@
 		28  => 1,
 		36  => 1,
 		44  => 1,
+		45  => 1,
 		65  => 1,
 		70  => 1,
 		85  => 1,
@@ -265,4 +265,3 @@ private function error_warning_message( $expected, $type, $number, $line ) {
 } else {
 	exit( 1 );
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ @@
 => 1,
 => 1,
 => 1,
-=> 1,
 => 1,
 => 1,
 => 1,
@@ Expand Down Expand Up / @@ -60,6 +59,7 @@ @@
 => 1,
 => 1,
 => 1,
+=> 1,
 => 1,
 => 1,
 => 1,
@@ Expand Down Expand Up @@
     } else {
     	exit( 1 );
     }