Merge pull request #84 from bystro/fix-83

Fix #83 JSON node equal to true|false|null aware
ubirak · Nov 23, 2017 · bc883ec · bc883ec
2 parents 21eeea4 + b8ee186
commit bc883ec
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/Json/JsonContext.php b/src/Json/JsonContext.php
@@ -45,6 +45,7 @@ public function theJsonNodeShouldBeEqualTo($jsonNode, $expectedValue)
     {
         $this->assert(function () use ($jsonNode, $expectedValue) {
             $realValue = $this->evaluateJsonNodeValue($jsonNode);
+            $expectedValue = $this->evaluateExpectedValue($expectedValue);
             $this->asserter->variable($realValue)->isEqualTo($expectedValue);
         });
     }
@@ -233,6 +234,19 @@ private function evaluateJsonNodeValue($jsonNode)
     {
         return $this->jsonInspector->readJsonNodeValue($jsonNode);
     }
+
+    private function evaluateExpectedValue($expectedValue) 
+    {
+        if (in_array($expectedValue, array('true', 'false'))) {
+            return filter_var($expectedValue, FILTER_VALIDATE_BOOLEAN);
+        }
+
+        if ($expectedValue === 'null') {
+            return null;
+        }
+
+        return $expectedValue;
+    }    
 
     private function readJson()
     {