From cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@users.noreply.github.com>
Date: Thu, 5 May 2016 20:43:27 +0100
Subject: [PATCH 1/2] FIX Add framework/admin tests (#118)

---
 phpunit.xml.dist | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8a62266..78d3abf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -22,6 +22,7 @@
 		<directory>mysite/tests</directory>
 		<directory>cms/tests</directory>
 		<directory>framework/tests</directory>
+		<directory>framework/admin/tests</directory>
 	</testsuite>
 	
 	<listeners>
@@ -33,4 +34,4 @@
 			<group>sanitychecks</group>
 		</exclude>
 	</groups>
-</phpunit>
\ No newline at end of file
+</phpunit>

From bb24a9192eef39070b010520003f6ff10c6521f0 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@users.noreply.github.com>
Date: Sun, 8 May 2016 11:05:19 +0100
Subject: [PATCH 2/2] Require php-tidy for dev dependencies (#87)

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index b64c447..f14bb7d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
 		"silverstripe-themes/simple": "*"
 	},
 	"require-dev": {
+		"ext-tidy": "*",
 		"phpunit/PHPUnit": "~3.7@stable"
 	},
 	"config": {