From 97dfa89b6d5a5742412d7f44e5b72b16bbe1fdd7 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 8 Jan 2016 11:40:24 -0500
Subject: [PATCH] Actually fix view tests

---
 README.md                       |  5 +++--
 tests/Ion/View/HtmlViewTest.php |  2 +-
 tests/Ion/View/JsonViewTest.php |  4 ++--
 tests/mocks.php                 | 13 +++++++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2f3944e7..ec2ce21b 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 A self-hosted client that allows custom formatting of data from the hummingbird api
 
 [![Build Status](https://jenkins.timshomepage.net/buildStatus/icon?job=animeclient)](https://jenkins.timshomepage.net/job/animeclient/)
+[![Build Status](https://travis-ci.org/timw4mail/HummingBirdAnimeClient.svg?branch=master)](https://travis-ci.org/timw4mail/HummingBirdAnimeClient)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/timw4mail/HummingBirdAnimeClient/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/timw4mail/HummingBirdAnimeClient/?branch=master)
 
 [[Hosted Example](https://list.timshomepage.net)]
@@ -15,7 +16,7 @@ A self-hosted client that allows custom formatting of data from the hummingbird
 	* On Hold
 	* Dropped
 	* Completed
-	* All of the above
+	* Combined View
 
 * Manga List views (Each with list and cover views):
 	* Reading
@@ -23,7 +24,7 @@ A self-hosted client that allows custom formatting of data from the hummingbird
 	* On Hold
 	* Dropped
 	* Completed
-	* All of the above
+	* Combined View
 
 * Anime collection view (segmented by media type):
 	* Cover Images
diff --git a/tests/Ion/View/HtmlViewTest.php b/tests/Ion/View/HtmlViewTest.php
index 53f20f59..cab5aecf 100644
--- a/tests/Ion/View/HtmlViewTest.php
+++ b/tests/Ion/View/HtmlViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once __DIR__ . "HttpViewTest.php";
+include_once __DIR__ . "/HttpViewTest.php";
 
 class HtmlViewTest extends HttpViewTest {
 
diff --git a/tests/Ion/View/JsonViewTest.php b/tests/Ion/View/JsonViewTest.php
index f40a9e77..8c1058c9 100644
--- a/tests/Ion/View/JsonViewTest.php
+++ b/tests/Ion/View/JsonViewTest.php
@@ -2,9 +2,9 @@
 
 use Aviat\Ion\Friend;
 
-include_once __DIR__ . "/../ViewTest.php";
+include_once __DIR__ . "/HttpViewTest.php";
 
-class JsonViewTest extends ViewTest {
+class JsonViewTest extends HttpViewTest {
 
 	public function setUp()
 	{
diff --git a/tests/mocks.php b/tests/mocks.php
index d9dffd4c..bc2510ba 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -76,8 +76,6 @@ class TestTransformer extends AbstractTransformer {
 	}
 }
 
-class TestView extends View {}
-
 trait MockViewOutputTrait {
 	protected function output() {
 		$reflect = new ReflectionClass($this);
@@ -101,6 +99,17 @@ trait MockViewOutputTrait {
 	}
 }
 
+class TestView extends View {
+	public function send() {}
+	protected function output()
+	{
+		$content =& $this->response->content;
+		$content->set($this->output);
+		$content->setType($this->contentType);
+		$content->setCharset('utf-8');
+	}
+}
+
 class TestHtmlView extends HtmlView {
 	use MockViewOutputTrait;
 }