Merge pull request #5 from Codeception/revert-3-upd

Naktibalda · web-flow · commit f488ff9bc08c · 2023-04-18T23:32:51.000+03:00
Revert "update url"
diff --git a/tests/Util/UriTest.php b/tests/Util/UriTest.php
@@ -37,7 +37,7 @@ public function testMergingScheme()
     {
         $this->assertSame(
             'https://google.com/account/',
-            Uri::mergeUrls('https://google.com/', 'https://google.com/account/')
+            Uri::mergeUrls('http://google.com/', 'https://google.com/account/')
         );
         $this->assertSame('https://facebook.com/', Uri::mergeUrls('https://google.com/test/', '//facebook.com/'));
         $this->assertSame(

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testMergingScheme()`
`37`	`37`	`{`
`38`	`38`	`$this->assertSame(`
`39`	`39`	`'https://google.com/account/',`
`40`		`- Uri::mergeUrls('https://google.com/', 'https://google.com/account/')`
	`40`	`+ Uri::mergeUrls('http://google.com/', 'https://google.com/account/')`
`41`	`41`	`);`
`42`	`42`	`$this->assertSame('https://facebook.com/', Uri::mergeUrls('https://google.com/test/', '//facebook.com/'));`
`43`	`43`	`$this->assertSame(`