FeatureResponseTest - added tests, changed getJSON to an accessor not a test

jim-parry · jim-parry · commit 2e59fd8c20f2 · 2018-12-07T00:48:24.000-08:00
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
@@ -298,15 +298,15 @@ public function assertSeeInField(string $field, string $value = null)
 	/**
 	 * Returns the response's body as JSON
 	 *
-	 * @return mixed|string
+	 * @return mixed|false
 	 */
 	public function getJSON()
 	{
 		$response = $this->response->getJSON();
 
 		if (is_null($response))
 		{
-			$this->fail('The Response contained invalid JSON.');
+			return false;
 		}
 
 		return $response;
diff --git a/tests/system/Test/FeatureResponseTest.php b/tests/system/Test/FeatureResponseTest.php
@@ -6,10 +6,12 @@
 
 class FeatureResponseTest extends CIUnitTestCase
 {
+
 	/**
 	 * @var FeatureResponse
 	 */
 	protected $feature;
+
 	/**
 	 * @var Response
 	 */
@@ -44,6 +46,15 @@ public function testIsOKSuccess()
 		$this->assertTrue($this->feature->isOK());
 	}
 
+	public function testIsOKEmpty()
+	{
+		$this->getFeatureResponse('Hi there');
+		$this->response->setStatusCode(200);
+		$this->response->setBody('');
+
+		$this->assertFalse($this->feature->isOK());
+	}
+
 	public function testAssertSee()
 	{
 		$this->getFeatureResponse('<h1>Hello World</h1>');
@@ -78,6 +89,14 @@ public function testAssertDontSeeElement()
 		$this->feature->assertDontSeeElement('h1.para');
 	}
 
+	public function testAssertSeeLink()
+	{
+		$this->getFeatureResponse('<h1 class="header"><a href="http://example.com/hello">Hello</a> <span>World</span></h1>');
+
+		$this->feature->assertSeeElement('h1');
+		$this->feature->assertSeeLink('Hello');
+	}
+
 	public function testAssertSeeInField()
 	{
 		$this->getFeatureResponse('<html><body><input type="text" name="user[name]" value="Foobar"></body></html>');
@@ -147,6 +166,14 @@ public function testAssertHeader()
 		$this->feature->assertHeader('foo', 'bar');
 	}
 
+	public function testAssertHeaderMissing()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
+
+		$this->feature->assertHeader('foo');
+		$this->feature->assertHeaderMissing('banana');
+	}
+
 	public function testAssertCookie()
 	{
 		$this->getFeatureResponse('<h1>Hello World</h1>');
@@ -184,6 +211,17 @@ public function testGetJSON()
 		$this->assertEquals($formatter->format(['foo' => 'bar']), $this->feature->getJSON());
 	}
 
+	public function testInvalidJSON()
+	{
+		$this->getFeatureResponse('<h1>Hello World</h1>');
+		$this->response->setJSON('');
+		$config    = new \Config\Format();
+		$formatter = $config->getFormatter('application/json');
+
+		// this should fail because of empty JSON
+		$this->assertFalse($this->feature->getJSON());
+	}
+
 	public function testGetXML()
 	{
 		$this->getFeatureResponse(['foo' => 'bar']);
@@ -265,4 +303,5 @@ protected function getFeatureResponse($body = null, array $responseOptions = [],
 
 		$this->feature = new FeatureResponse($this->response);
 	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -298,15 +298,15 @@ public function assertSeeInField(string $field, string $value = null)`
`298`	`298`	`/**`
`299`	`299`	`* Returns the response's body as JSON`
`300`	`300`	`*`
`301`		`- * @return mixed\|string`
	`301`	`+ * @return mixed\|false`
`302`	`302`	`*/`
`303`	`303`	`public function getJSON()`
`304`	`304`	`{`
`305`	`305`	`$response = $this->response->getJSON();`
`306`	`306`
`307`	`307`	`if (is_null($response))`
`308`	`308`	`{`
`309`		`- $this->fail('The Response contained invalid JSON.');`
	`309`	`+ return false;`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`return $response;`