Merge pull request #1 from rest-control/0.4

kamszel · web-flow · commit 7062100aad9e · 2018-03-20T20:16:57.000+01:00
0.4
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ NAME ?= rest-control
 CONSOLE := docker-compose -p $(NAME) -f ./Docker/docker.yml
 
 start:
+	- docker network create rest-control
 	@-$(CONSOLE) up -d
 stop:
 	@-$(CONSOLE) stop
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "rest-control/rest-control": "0.3.0-alpha",
+    "rest-control/rest-control": "dev-master",
     "symfony/console": "^3.4"
   },
   "autoload": {
diff --git a/examples/ExpressionLanguageTest.php b/examples/ExpressionLanguageTest.php
@@ -15,13 +15,13 @@ class ExpressionLanguageTest extends AbstractTestCase
      */
     public function exampleEndsWith()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$.address.street', $this->endsWith('Light'))
-            ->jsonPath('$.email', $this->endsWith('incere@april.biz'))
-            ->jsonPath('$.phone', $this->endsWith('-770-736-8031 x56442'));
+            ->jsonPath('$.address.street', endsWith('Light'))
+            ->jsonPath('$.email', endsWith('incere@april.biz'))
+            ->jsonPath('$.phone', endsWith('-770-736-8031 x56442'));
     }
 
     /**
@@ -33,13 +33,13 @@ public function exampleEndsWith()
      */
     public function exampleContainsString()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$.address.street', $this->containsString('ight'))
-            ->jsonPath('$.phone', $this->containsString('736-8031'))
-            ->jsonPath('$.company.bs', $this->containsString('harness'));
+            ->jsonPath('$.address.street', containsString('ight'))
+            ->jsonPath('$.phone', containsString('736-8031'))
+            ->jsonPath('$.company.bs', containsString('harness'));
     }
 
     /**
@@ -51,13 +51,13 @@ public function exampleContainsString()
      */
     public function exampleStartsWith()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$.address.street', $this->startsWith('Kulas'))
-            ->jsonPath('$.phone', $this->startsWith('1-770-736'))
-            ->jsonPath('$.company.catchPhrase', $this->startsWith('Multi-layered client'));
+            ->jsonPath('$.address.street', startsWith('Kulas'))
+            ->jsonPath('$.phone', startsWith('1-770-736'))
+            ->jsonPath('$.company.catchPhrase', startsWith('Multi-layered client'));
     }
     /**
      * @test(
@@ -68,12 +68,12 @@ public function exampleStartsWith()
      */
     public function exampleEqualsTo()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$.id', $this->equalsTo(1))
-            ->jsonPath('$.phone', $this->equalsTo('1-770-736-8031 x56442'))
-            ->jsonPath('$.company.catchPhrase', $this->equalsTo('Multi-layered client-server neural-net'));
+            ->jsonPath('$.id', equalsTo(1))
+            ->jsonPath('$.phone', equalsTo('1-770-736-8031 x56442'))
+            ->jsonPath('$.company.catchPhrase', equalsTo('Multi-layered client-server neural-net'));
     }
 }
diff --git a/examples/HasItemTest.php b/examples/HasItemTest.php
@@ -18,11 +18,11 @@ public function exampleFindUser()
     {
         $userItem = new UserObject();
 
-        return $this->send()
-                    ->get('sample.service/users/1')
-                    ->expectedResponse()
-                    ->json()
-                    ->hasItem($userItem);
+        return send()
+            ->get('sample.service/users/1')
+            ->expectedResponse()
+            ->json()
+            ->hasItem($userItem);
     }
 
     /**
@@ -46,7 +46,7 @@ public function exampleFindUser1WithRequiredValues()
             ],
         ]);
 
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
@@ -67,7 +67,7 @@ public function exampleFindUser1WithOnlyGivenRequiredValuesFails()
             'name' => 'Leanne Graham',
         ]);
 
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
diff --git a/examples/HasItemsTest.php b/examples/HasItemsTest.php
@@ -19,7 +19,7 @@ public function exampleGetUsers()
     {
         $userItemsCollection = new ResponseItemsCollection(UserObject::class);
 
-        return $this->send()
+        return send()
             ->get('sample.service/users')
             ->expectedResponse()
             ->json()
@@ -64,7 +64,7 @@ public function exampleGetUsersWithRequiredValues()
                 ])
             );
 
-        return $this->send()
+        return send()
             ->get('sample.service/users')
             ->expectedResponse()
             ->json()
diff --git a/examples/HttpBasicAuthTest.php b/examples/HttpBasicAuthTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Examples;
+
+use RestControl\TestCase\AbstractTestCase;
+
+class HttpBasicAuthTest extends AbstractTestCase
+{
+    /**
+     * @test(
+     *     title="Login via http basic auth",
+     *     description="Login via http basic auth (For this test you need RestControl training server, https://github.com/rest-control/training-server.)",
+     *     tags="auth httpBasicAuth"
+     * )
+     */
+    public function exampleHttpBasicAuthSuccess()
+    {
+        return send()
+            ->get( $this->getVar('training') . 'basic-auth')
+            ->httpBasicAuth('nwoodroof0@comsenz.com', 'eId4ZuZBCiI7')
+            ->expectedResponse()
+            ->json()
+            ->httpCode(200)
+            ->jsonPath('$.status', equalsTo('ok'));
+    }
+
+    /**
+     * @test(
+     *     title="Login via http basic auth",
+     *     description="Login via http basic auth (For this test you need RestControl training server, https://github.com/rest-control/training-server.)",
+     *     tags="auth httpBasicAuthInvalidCredentials"
+     * )
+     */
+    public function exampleHttpBasicAuthInvalidCredentials ()
+    {
+        return send()
+            ->get( $this->getVar('training') . 'basic-auth')
+            ->httpBasicAuth('sampleInvalidUser', 'samplePassword')
+            ->expectedResponse()
+            ->httpCode(401);
+    }
+}
diff --git a/examples/HttpStatusCodesTest.php b/examples/HttpStatusCodesTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Examples;
+
+use RestControl\TestCase\AbstractTestCase;
+
+class HttpStatusCodesTest extends AbstractTestCase
+{
+    /**
+     * @test(
+     *     title="Check given httpCode.",
+     *     description="Check httpCode with given value",
+     *     tags="httpStatusCodes givenHttpCode"
+     * )
+     */
+    public function exampleGivenHttpStatusCodes()
+    {
+        return send()
+            ->get('sample.service/users/1')
+            ->expectedResponse()
+            ->httpCode(200);
+    }
+
+    /**
+     * @test(
+     *     title="Check httpCode via helper.",
+     *     description="Check httpCode via helper",
+     *     tags="httpStatusCodes httpCodeOkHelper"
+     * )
+     */
+    public function exampleOkHelper()
+    {
+        return send()
+            ->get('sample.service/users/1')
+            ->expectedResponse()
+            ->httpStatusOk();
+    }
+}
diff --git a/examples/JsonPathTest.php b/examples/JsonPathTest.php
@@ -15,11 +15,11 @@ class JsonPathTest extends AbstractTestCase
      */
     public function exampleSimpleValue()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users/1')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$.address.street', $this->endsWith('Light'));
+            ->jsonPath('$.address.street', endsWith('Light'));
     }
 
     /**
@@ -31,11 +31,11 @@ public function exampleSimpleValue()
      */
     public function exampleSimpleValueOnList()
     {
-        return $this->send()
+        return send()
             ->get('sample.service/users')
             ->expectedResponse()
             ->json()
-            ->jsonPath('$..company.constValue', $this->endsWith('Value'));
+            ->jsonPath('$..company.constValue', endsWith('Value'));
     }
 
     /**
@@ -47,7 +47,7 @@ public function exampleSimpleValueOnList()
      */
     public function exampleSimpleValueWithCallback()
     {
-        return $this->send()
+        return send()
                     ->get('sample.service/users')
                     ->expectedResponse()
                     ->json()
diff --git a/rest-control.yml b/rest-control.yml
@@ -11,4 +11,6 @@ apiMockResponses:
 apiClient: \RestControl\ApiClient\MockApiClient
 #Custom response filters
 #responseFilters:
-#  - \Sample\Filter\Response\Class
+#  - \Sample\Filter\Response\Class
+variables:
+  training: http://{{TRAINING_SERVER_CONTAINER_WEB_IP}}/

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "rest-control/rest-control": "0.3.0-alpha",`
	`13`	`+ "rest-control/rest-control": "dev-master",`
`14`	`14`	`"symfony/console": "^3.4"`
`15`	`15`	`},`
`16`	`16`	`"autoload": {`