Added missing requirements for phingofficial#826 (phingofficial#931)

CrossKnowledge · Jun 11, 2018 · cfa1752 · cfa1752
1 parent 4043609
commit cfa1752
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/docs/guide/en/source/appendixes/optionaltasks.xml b/docs/guide/en/source/appendixes/optionaltasks.xml
@@ -4391,6 +4391,13 @@ Note that you can omit both startpoint and track attributes in this case
                         <entry>n/a</entry>
                         <entry>No</entry>
                     </row>
+                    <row>
+                        <entry><literal>responseCodeRegex</literal></entry>
+                        <entry><literal role="type">String</literal></entry>
+                        <entry>The regular expression for matching the response code</entry>
+                        <entry>n/a</entry>
+                        <entry>No</entry>
+                    </row>
                     <row>
                         <entry><literal>authUser</literal></entry>
                         <entry><literal role="type">String</literal></entry>

diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
@@ -3885,6 +3885,9 @@
                 <optional>
                     <attribute name="responseregex"/>
                 </optional>
+                <optional>
+                    <attribute name="responsecoderegex"/>
+                </optional>
                 <optional>
                     <attribute name="authuser"/>
                 </optional>

diff --git a/test/classes/phing/tasks/ext/HTTP/HttpRequestTaskTest.php b/test/classes/phing/tasks/ext/HTTP/HttpRequestTaskTest.php
@@ -50,6 +50,13 @@ public function testMatchesRegexp()
         $this->expectLog('recipient', 'The response body matched the provided regex.');
     }
 
+    public function testMatchesCodeRegexp()
+    {
+        $this->copyTasksAddingCustomRequest('matchesCodeRegexp', 'recipient', $this->createRequestWithMockAdapter());
+
+        $this->expectLog('recipient', 'The response status-code matched the provided regex.');
+    }
+
     /**
      * @expectedException BuildException
      * @expectedExceptionMessage The received response body did not match the given regular expression

diff --git a/test/etc/tasks/ext/http/httprequest.xml b/test/etc/tasks/ext/http/httprequest.xml
@@ -8,11 +8,15 @@
     </target>
 
     <target name="matchesRegexp">
-        <http-request url="http://example.com/" responseRegex="/foo/" />
+        <http-request url="http://example.com/" responseRegex="foo" />
+    </target>
+
+    <target name="matchesCodeRegexp">
+        <http-request url="http://example.com/" responseCodeRegex="200" />
     </target>
 
     <target name="doesNotMatchRegexp">
-        <http-request url="http://example.com/" responseRegex="/bar/" />
+        <http-request url="http://example.com/" responseRegex="bar" />
     </target>
 
     <target name="post">