Merge pull request #102 from richardgaunt/master

Json path expression should have a result does not check for empty result list
ubirak · Jan 14, 2021 · 1c0b3ce · 1c0b3ce
2 parents 5421575 + e63f5b7
commit 1c0b3ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,6 @@ before_script:
         if [ ! $(php -m | grep -ci xdebug) -eq 0 ] ; then
             phpenv config-rm xdebug.ini
         fi
-    - composer global require hirak/prestissimo
     - composer update $COMPOSER_PREFER
     - |
         # We force latest atoum on php >=7

diff --git a/features/json_inspection.feature b/features/json_inspection.feature
@@ -143,6 +143,7 @@ Feature: Test json inspection payload
 
     Scenario: JSON path expression equal to inline json
         Then the JSON path expression "foos[?foo == 'bar'].bar" should be equal to json '["bar"]'
+        Then the JSON path expression "foos[?foo == 'nobar'].bar" should be equal to json '[]'
 
     Scenario: JSON path expression equal to given json
         Then the JSON path expression "foos[?foo == 'bar'].bar" should be equal to:
@@ -155,3 +156,4 @@ Feature: Test json inspection payload
 
     Scenario: JSON path expression have result
         Then the JSON path expression "fooo.bar" should not have result
+        Then the JSON path expression "foos[?foo == 'nobar'].bar" should not have result
diff --git a/src/Json/JsonContext.php b/src/Json/JsonContext.php
@@ -219,6 +219,7 @@ public function theJsonPathExpressionShouldHaveResult($pathExpression)
     {
         $json = $this->jsonInspector->searchJsonPath($pathExpression);
         $this->asserter->variable($json)->isNotNull();
+        $this->asserter->variable($json)->isNotEqualTo([]);
     }
 
     /**
@@ -227,7 +228,11 @@ public function theJsonPathExpressionShouldHaveResult($pathExpression)
     public function theJsonPathExpressionShouldNotHaveResult($pathExpression)
     {
         $json = $this->jsonInspector->searchJsonPath($pathExpression);
-        $this->asserter->variable($json)->isNull();
+        if (is_array($json) && empty($json)) {
+          $this->asserter->variable($json)->isEqualTo([]);
+        } else {
+          $this->asserter->variable($json)->isNull();
+        }
     }
 
     private function evaluateJsonNodeValue($jsonNode)