FIX: Added parent::__construct to tests. Patched path to YML fixture.

phptek · Apr 30, 2018 · 6d49c75 · 6d49c75
1 parent 81e087b
commit 6d49c75
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 2 deletions.
diff --git a/tests/JSONTextBasicTest.php b/tests/JSONTextBasicTest.php
@@ -36,6 +36,8 @@ public function __construct()
         foreach($this->fixtures as $name => $path) {
             $this->fixtures[$name] = realpath(__DIR__) . '/' . $path;
         }
+
+        parent::__construct();
     }
 
     /**

diff --git a/tests/JSONTextExtensionTest.php b/tests/JSONTextExtensionTest.php
@@ -23,7 +23,19 @@ class JSONTextExtensionTest extends FunctionalTest
     /**
      * @var string
      */
-    protected static $fixture_file = 'jsontext/tests/fixtures/yml/JSONTextExtension.yml';
+    protected static $fixture_file;
+
+    /**
+     * Modifies fixtures property to be able to run on PHP <5.6 without use of constant in class property which 5.6+ allows
+     */
+    public function __construct()
+    {
+        $dir = realpath(__DIR__);
+
+        self::$fixture_file = $dir . '/fixtures/yml/JSONTextExtension.yml';
+
+        parent::__construct();
+    }
 
     /**
      * Is an exception thrown when no POSTed vars are available for

diff --git a/tests/JSONTextIntegrationTest.php b/tests/JSONTextIntegrationTest.php
@@ -16,7 +16,7 @@ class JSONTextIntegrationTest extends SapphireTest
     /**
      * @var string
      */
-    protected static $fixture_file = '/fixtures/yml/MyAwesomeJSONModel.yml';
+    protected static $fixture_file;
 
     /**
      * Modifies fixtures property to be able to run on PHP <5.6 without use of constant in class property which 5.6+ allows
@@ -26,6 +26,8 @@ public function __construct()
         $dir = realpath(__DIR__);
 
         self::$fixture_file = $dir . '/fixtures/yml/MyAwesomeJSONModel.yml';
+
+        parent::__construct();
     }
 
     /**

diff --git a/tests/JSONTextQueryTest.php b/tests/JSONTextQueryTest.php
@@ -42,6 +42,8 @@ public function __construct()
         foreach($this->fixtures as $name => $path) {
             $this->fixtures[$name] = realpath(__DIR__) . '/' . $path;
         }
+
+        parent::__construct();
     }
 
     /**

diff --git a/tests/JSONTextSetValueTest.php b/tests/JSONTextSetValueTest.php
@@ -30,6 +30,8 @@ public function __construct()
         foreach($this->fixtures as $name => $path) {
             $this->fixtures[$name] = realpath(__DIR__) . '/' . $path;
         }
+
+        parent::__construct();
     }
 
     /**

diff --git a/tests/JSONTextTest.php b/tests/JSONTextTest.php
@@ -33,6 +33,8 @@ public function __construct()
         foreach($this->fixtures as $name => $path) {
             $this->fixtures[$name] = realpath(__DIR__) . '/' . $path;
         }
+
+        parent::__construct();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,8 @@ public function __construct() @@
             foreach($this->fixtures as $name => $path) {
                 $this->fixtures[$name] = realpath(__DIR__) . '/' . $path;
             }
+            parent::__construct();
         }
         /**
@@ Expand Down @@