@ASSERTCODE renamed to @httpcode (BC break!) and is checked on in CGI…

… mode
nette · Jul 16, 2013 · 00496a6 · 00496a6
1 parent 75a2fe8
commit 00496a6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Tester/Runner/Job.php b/Tester/Runner/Job.php
@@ -156,10 +156,10 @@ public function collect()
 		}
 
 		// HTTP code check
-		if (isset($this->options['assertcode'])) {
+		if (isset($this->options['httpcode']) && $this->php->isCgi()) {
 			$code = isset($this->headers['Status']) ? (int) $this->headers['Status'] : 200;
-			if ($code !== (int) $this->options['assertcode']) {
-				throw new JobException('Expected HTTP code ' . $this->options['assertcode'] . ' is not same as actual code ' . $code);
+			if ($code !== (int) $this->options['httpcode']) {
+				throw new JobException("Exited with HTTP code $code (expected {$this->options['httpcode']})");
 			}
 		}
 	}

diff --git a/tests/Http.code.200.phpt b/tests/Http.code.200.phpt
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * @httpCode 200
+ */
+
+require __DIR__ . '/bootstrap.php';
diff --git a/tests/Http.code.500.phpt b/tests/Http.code.500.phpt
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @httpCode 500
+ */
+
+require __DIR__ . '/bootstrap.php';
+
+
+header('HTTP', TRUE, 500);