Updated url construcition logic, so it does not produce double slashes. Removed autoprefixing of url with slash, as that should be done by users explicitely.

Author: nicholascus

src/Codeception/Module/REST.php

@@ -575,11 +575,10 @@ public function sendUNLINK($url, array $linkEntries)
     protected function execute($method, $url, $parameters = [], $files = [])
     {
         // allow full url to be requested
-        if (strpos($url, '://') === false) {
-            $url = $this->config['url'] . $url;
-            if ($this->config['url'] && strpos($url, '://') === false && strpos($url, '/') !== 0 && $this->config['url'][0] !== '/') {
-                $url = '/' . $url;
-            }
+        if (!$url) {
+            $url = $this->config['url'];
+        } elseif (strpos($url, '://') === false && $this->config['url']) {
+            $url = rtrim($this->config['url'], '/') . '/' . ltrim($url, '/');
         }
 
         $this->params = $parameters;

tests/unit/Codeception/Module/RestTest.php

@@ -311,7 +311,7 @@ public function testSeeResponseJsonMatchesXPathWorksWithAmpersand()
         $this->module->seeResponseJsonMatchesXpath('//comment');
     }
 
-    
+
     public function testSeeResponseJsonMatchesJsonPathFails()
     {
         $this->shouldFail();
@@ -322,8 +322,8 @@ public function testSeeResponseJsonMatchesJsonPathFails()
         $this->module->seeResponseIsJson();
         $this->module->seeResponseJsonMatchesJsonPath('$[*].profile');
     }
-    
-    
+
+
     public function testStructuredJsonPathAndXPath()
     {
         $this->setStubResponse(
@@ -442,6 +442,63 @@ public function testAmDigestAuthenticatedThrowsExceptionWithFunctionalModules()
         $this->module->amDigestAuthenticated('username', 'password');
     }
 
+    /**
+     * @param $configUrl
+     * @param $requestUrl
+     * @param $expectedFullUrl
+     *
+     * @dataProvider configAndRequestUrls
+     */
+    public function testRestExecute($configUrl, $requestUrl, $expectedFullUrl)
+    {
+        $connectionModule = $this->createMock(
+            \Codeception\Module\UniversalFramework::class
+        );
+        $connectionModule
+            ->expects($this->once())
+            ->method('_request')
+            ->will(
+                $this->returnCallback(function($method,
+                    $uri,
+                    $parameters,
+                    $files,
+                    $server,
+                    $content
+                ) use ($expectedFullUrl) {
+                    \PHPUnit\Framework\Assert::assertEquals($expectedFullUrl, $uri);
+                })
+            );
+
+        $config = ['url' => $configUrl];
+
+        /** @var \Codeception\Module\REST */
+        $module = Stub::make('\Codeception\Module\REST');
+        $module->_setConfig($config);
+        $module->_inject($connectionModule);
+        $module->_initialize();
+        $module->_before(Stub::makeEmpty('\Codeception\Test\Test'));
+
+        $module->sendGET($requestUrl);
+    }
+
+    public static function configAndRequestUrls()
+    {
+        return [
+                //$configUrl, $requestUrl, $expectedFullUrl
+                ['v1/', 'healthCheck', 'v1/healthCheck'],
+                ['/v1', '/healthCheck', '/v1/healthCheck'],
+                ['v1', 'healthCheck', 'v1/healthCheck'],
+                ['http://v1/', '/healthCheck', 'http://v1/healthCheck'],
+                ['http://v1', 'healthCheck', 'http://v1/healthCheck'],
+                ['http://v1', 'http://v2/healthCheck', 'http://v2/healthCheck'],
+                ['http://v1', '', 'http://v1'],
+                ['http://v1', '/', 'http://v1/'],
+                ['', 'http://v1', 'http://v1'],
+                ['', 'healthCheck', 'healthCheck'],
+                ['/', 'healthCheck', '/healthCheck'],
+            ];
+    }
+
     protected function shouldFail()
     {
         $this->expectException('PHPUnit\Framework\AssertionFailedError');