Fixes tests

Denis Smetannikov · Denis Smetannikov · commit cefe2c8665f2 · 2020-06-15T15:55:25.000+03:00
diff --git a/tests/AbstractDriverTest.php b/tests/AbstractDriverTest.php
@@ -103,10 +103,10 @@ public function testAllMethods()
             isSame($method, $body->find('method'), $message);
 
             if ($method === 'GET') {
-                isContain(Url::addArg($args, $url), $body->find('url'), $message);
+                $this->isSameUrl(Url::addArg($args, $url), $body->find('url'), $message);
                 isSame($uniq, $body->find('queryString.qwerty'), $message);
             } else {
-                isContain($url, $body->find('url'), $message);
+                $this->isContainUrl($url, $body->find('url'), $message);
                 if ($this->driver === 'Rmccue' && $method === 'DELETE') {
                     skip('DELETE is not supported with Rmccue/Requests correctly');
                 }
@@ -140,7 +140,7 @@ public function testGetQueryString()
         isContain('application/json', $result->getHeader('Content-Type'));
 
         $body = $result->getJSON();
-        isSame(Url::addArg($args, $url), $body->find('url'));
+        $this->isSameUrl(Url::addArg($args, $url), $body->find('url'));
         isSame($uniq, $body->find('args.qwerty'));
         isSame('value', $body->find('args.key'));
     }
@@ -166,7 +166,7 @@ public function testPost()
 
         isSame(200, $result->code);
         isContain('application/json', $result->find('headers.content-type'));
-        isContain('httpbin.org/post?key=value', $body->find('url'));
+        $this->isSameUrl('//httpbin.org/post?key=value', $body->find('url'));
         isSame($uniq, $body->find('form.qwerty'));
         isSame('value', $body->find('args.key'));
     }
@@ -246,7 +246,7 @@ public function testMultiRedirects()
         $body = $result->getJSON();
 
         isSame(200, $result->code);
-        isSame('http://httpbin.org/get', $body->get('url'));
+        $this->isSameUrl('http://httpbin.org/get', $body->get('url'));
     }
 
     public function testDelayError()
@@ -278,7 +278,7 @@ public function testDelay()
         $body = $result->getJSON();
 
         isSame(200, $result->code);
-        isSame($url, $body->get('url'));
+        $this->isSameUrl($url, $body->get('url'));
     }
 
     public function testSSL()
@@ -326,4 +326,33 @@ public function testMultiRequest()
         isSame('POST', $body2->find('method'));
         isSame('value', $body2->find('postData.params.key'));
     }
+
+    /**
+     * @param string $expected
+     * @param string $actual
+     * @param string $message
+     */
+    private function isSameUrl(string $expected, string $actual, string $message = '')
+    {
+        isSame(
+            str_replace(['https://', 'http://'], '//', $expected),
+            str_replace(['https://', 'http://'], '//', $actual),
+            $message
+        );
+    }
+
+    /**
+     * @param string $expected
+     * @param string $actual
+     * @param string $message
+     */
+    private function isContainUrl(string $expected, string $actual, string $message = '')
+    {
+        isContain(
+            str_replace(['https://', 'http://'], '//', $expected),
+            str_replace(['https://', 'http://'], '//', $actual),
+            false,
+            $message
+        );
+    }
 }
