Fix data tests

nerds-and-company · Feb 10, 2019 · 056adf4 · 056adf4
1 parent eec8a07
commit 056adf4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/src/Models/Data.php b/src/Models/Data.php
@@ -19,18 +19,6 @@
  */
 class Data extends Model
 {
-    /**
-     * Parse a yaml file.
-     *
-     * @param string $yaml
-     *
-     * @return array
-     */
-    public static function fromYaml($yaml): array
-    {
-        return Yaml::parse($yaml);
-    }
-
     /**
      * Replace placeholders with enviroment variables.
      *

diff --git a/tests/unit/Models/DataTest.php b/tests/unit/Models/DataTest.php
@@ -21,15 +21,15 @@ class DataTest extends Unit
      */
     private function getSchemaTestFile()
     {
-        return file_get_contents(__DIR__.'/../../_data/test_schema.yml');
+        return __DIR__.'/../../_data/test_schema.yml';
     }
 
     /**
      * @return string
      */
     private function getOverrideTestFile()
     {
-        return file_get_contents(__DIR__.'/../../_data/test_override.yml');
+        return __DIR__.'/../../_data/test_override.yml';
     }
 
     /**
@@ -41,10 +41,10 @@ private function generateDataModel($useOverride = false)
     {
         putenv('SCHEMATIC_S3_SECRET_ACCESS_KEY=secret');
 
-        $schema = $this->getSchemaTestFile();
-        $override = $useOverride ? $this->getOverrideTestFile() : [];
+        $schema = Data::parseYamlFile($this->getSchemaTestFile());
+        $override = $useOverride ? Data::parseYamlFile($this->getOverrideTestFile()) : [];
 
-        return Data::fromYaml($schema, $override);
+        return array_replace_recursive($schema, $override);
     }
 
     public function testEnvironment()
@@ -92,9 +92,7 @@ public function testErrorWhenEnvironmentVariableNotSet()
         putenv('S3_BUCKET');
         putenv('SCHEMATIC_S3_BUCKET');
         $this->expectException('Exception');
-        $schema = $this->getSchemaTestFile();
-        $override = $this->getOverrideTestFile();
-        Data::fromYaml($schema, $override);
+        $result = $this->generateDataModel(true);
     }
 
     public function testToYamlIsValidYaml()
@@ -115,7 +113,7 @@ public function testToYamlContainsCorrectText()
 
     public function testToYamlOverride()
     {
-        putenv('S3_BUCKET=bucket_name');
+        putenv('S3_BUCKET=%S3_BUCKET%');
         $dataModel = $this->generateDataModel();
         $override = $this->getOverrideTestFile();
         $yaml = Data::toYaml($dataModel, $override);