Merge branch 'Valicek1-master' into 'master'

mrtnzlml-archive · Aug 5, 2016 · 414e09d · 414e09d
2 parents 7c2624f + e2fd316
commit 414e09d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -33,6 +33,7 @@ public static function setup($tempDir, $callback = NULL)
 
 		$_SERVER['HTTP_USER_AGENT'] = 'Awesome Browser';
 		$_SERVER['REMOTE_ADDR'] = '11.22.33.44';
+		$_SERVER['HTTP_HOST'] = $_SERVER['SERVER_NAME'] = 'test.bench';
 	}
 
 }
diff --git a/src/Scaffold/TestsGenerator.php b/src/Scaffold/TestsGenerator.php
@@ -94,8 +94,8 @@ public function generateTests($outputFolder)
 						break;
 					case 'action':
 						if ($extra instanceof \Nette\Application\Responses\RedirectResponse) {
-							$path = preg_replace('~^https?://([/a-z0-9]+).*~i', '$1', $extra->getUrl());
-							$generatedMethod->addBody('$this->checkRedirect(?, ?);', [$destination, $path]);
+							$url = new \Nette\Http\Url($extra->getUrl());
+							$generatedMethod->addBody('$this->checkRedirect(?, ?);', [$destination, $url->getPath()]);
 						} elseif ($extra instanceof \Nette\Application\Responses\JsonResponse) {
 							$generatedMethod->addBody('$this->checkJson(?);', [$destination]);
 						} else {
@@ -144,7 +144,7 @@ public function generateTests($outputFolder)
 					);
 				} catch (\Nette\Application\AbortException $exc) {
 					$extra = $this->getResponse($service);
-					$path = $extra ? preg_replace('~^https?://([/a-z0-9]+).*~i', '$1', $extra->getUrl()) : '/';
+					$path = $extra ? (new \Nette\Http\Url($extra->getUrl()))->getPath() : '/';
 					$testClass->addMethod('test' . ucfirst($testMethod))->addBody(
 						"\$this->checkForm(?, ?, [\n" . $controls . '], ?);',
 						[$destination . ':', $action, $path]

diff --git a/tests/Runner/Bootstrap.phpt b/tests/Runner/Bootstrap.phpt
@@ -29,6 +29,8 @@ class Bootstrap extends \Tester\TestCase
 	{
 		Assert::same('Awesome Browser', $_SERVER['HTTP_USER_AGENT']);
 		Assert::same('11.22.33.44', $_SERVER['REMOTE_ADDR']);
+		Assert::same('test.bench', $_SERVER['HTTP_HOST']);
+		Assert::same('test.bench', $_SERVER['SERVER_NAME']);
 	}
 
 }