Fixed Travis and PhpUnit tests.

scholarslab · Nov 27, 2016 · b3ddbd2 · b3ddbd2
1 parent 38fe127
commit b3ddbd2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,21 @@
+# Travis doesn't pass 5.2 and 5.3 anymore, neither Omeka 2.0.
 language: php
 
 php:
-  - 5.2
-  - 5.3
-  #- 5.4
+  #- 5.2
+  #- 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
 
 env:
   #- OMEKA_BRANCH=stable-1.5
-  - OMEKA_BRANCH=stable-2.0
+  #- OMEKA_BRANCH=stable-2.0
+  - OMEKA_BRANCH=stable-2.1
+  - OMEKA_BRANCH=stable-2.2
+  - OMEKA_BRANCH=stable-2.3
+  - OMEKA_BRANCH=stable-2.4
 
 before_script: 
   - ./travis_setup.sh

diff --git a/tests/NeatlineTime_Test_AppTestCase.php b/tests/NeatlineTime_Test_AppTestCase.php
@@ -2,7 +2,6 @@
 /**
  * Testing helper class.
  */
-require_once '../NeatlineTimePlugin.php';
 
 class NeatlineTime_Test_AppTestCase extends Omeka_Test_AppTestCase
 {

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -16,4 +16,11 @@
         highLowerBound="70" />
     </logging>
 
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">.</directory>
+            <exclude />
+        </whitelist>
+    </filter>
+
 </phpunit>
diff --git a/tests/phpunit_travis.xml b/tests/phpunit_travis.xml
@@ -1,6 +1,6 @@
 <phpunit bootstrap="bootstrap.php"
-  convertErrorsToExceptions="false"
-  convertWarningsToExceptions="false"
+  convertErrorsToExceptions="true"
+  convertWarningsToExceptions="true"
   colors="true"
   verbose="true">
 

diff --git a/travis_tests.sh b/travis_tests.sh
@@ -12,6 +12,5 @@ fi
 echo "Plugin Directory: $PLUGIN_DIR"
 echo "Omeka Directory: $OMEKA_DIR"
 
-cd $PLUGIN_DIR/tests/
 cat $(which phpunit)
-phpunit --configuration phpunit_travis.xml
+cd tests/ && phpunit --configuration phpunit_travis.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     /**
      * Testing helper class.
      */
-    require_once '../NeatlineTimePlugin.php';
     class NeatlineTime_Test_AppTestCase extends Omeka_Test_AppTestCase
     {
@@ Expand Down @@