Merge pull request #2 from LGouttefange/feature/annotations_in_subdir…

…ectory

feature: Add the ability to load expectations in subdirectories via annotation

README.md

@@ -134,7 +134,7 @@ Retrieves all the requests received by Phiremock server matching the one specifi
 
 ### @expectation Annotations
 
-Allows you to to set up an expectation via a json file 
+Allows you to to set up an expectation via a json file
 
 ```php
     /**
@@ -148,6 +148,18 @@ Allows you to to set up an expectation via a json file
 
 That will load by default the file at `tests/_data/phiremock-expectations/get_client_timeout.json`. The path where to place the expectations is configurable.
 
+You may use expectations placed in subdirectories
+
+```php
+    /**
+     * @expectation("edge_cases/get_client_timeout")
+     */
+    public function test(FunctionalTester $I)
+    {
+        ...
+    }
+```
+
 Multiple annotation formats are accepted
 
 ```
@@ -161,4 +173,4 @@ Multiple annotation formats are accepted
 ## See also:
 
 Phiremock Client: https://github.com/mcustiel/phiremock-client
-Examples in tests: https://github.com/mcustiel/phiremock-codeception-module/tree/master/tests/acceptance
+Examples in tests: https://github.com/mcustiel/phiremock-codeception-module/tree/master/tests/acceptance

src/Util/ExpectationAnnotationParser.php

@@ -43,7 +43,7 @@ public function getExpectations(TestInterface $test): array
     public function parseExpectation(string $expectationAnnotation): string
     {
         $matches = [];
-        $expectationRegex = '/\(?\"?(?<filePath>[a-zA-Z0-9_]+)(.json)?\"?\)?/';
+        $expectationRegex = '/\(?\"?(?<filePath>[a-zA-Z0-9_\\/]+)(.json)?\"?\)?/';
         preg_match($expectationRegex, $expectationAnnotation, $matches);
 
         if (empty($matches)) {

tests/_data/_unique_expectations/subdirectory/test_first_get.json

@@ -0,0 +1,15 @@
+{
+  "request": {
+    "method": "GET",
+    "url": {
+      "isEqualTo" : "/expectation/subdirectory"
+    }
+  },
+  "response": {
+    "statusCode": 200,
+    "body": "response",
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

tests/acceptance/BasicTestCest.php

@@ -139,6 +139,19 @@ public function testMultipleAnnotationsAreLoaded(AcceptanceTester $I)
         $requests = $I->grabRequestsMadeToRemoteService($requestBuilder);
         $I->assertCount(2, $requests);
     }
+
+    /**
+     * @param AcceptanceTester $I
+     * @expectation("subdirectory/test_first_get")
+     */
+    public function testAnnotationInSubdirectoryIsLoaded(AcceptanceTester $I)
+    {
+        $conditionsBuilder = A::getRequest();
+        $requestBuilder = $conditionsBuilder->andMethod(Is::equalTo('GET'))->andUrl(Is::equalTo('/expectation/subdirectory'));
+        file_get_contents('http://localhost:18080/expectation/subdirectory');
+        $requests = $I->grabRequestsMadeToRemoteService($requestBuilder);
+        $I->assertCount(1, $requests);
+    }
 
     /**
      * @param AcceptanceTester $I