From 39fc16ddfcfe2f8ccddc2b78b5237b0ec166dae8 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 5 Apr 2016 00:02:32 +1000
Subject: [PATCH] Fixes tests so they pass

---
 tests/unit/cms/classes/CmsCompoundObjectTest.php |  9 ++++++---
 tests/unit/cms/classes/CmsObjectQueryTest.php    |  7 +++----
 tests/unit/cms/classes/ControllerTest.php        | 10 ++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/unit/cms/classes/CmsCompoundObjectTest.php b/tests/unit/cms/classes/CmsCompoundObjectTest.php
index f216c0f84..875a44c1f 100644
--- a/tests/unit/cms/classes/CmsCompoundObjectTest.php
+++ b/tests/unit/cms/classes/CmsCompoundObjectTest.php
@@ -3,6 +3,7 @@
 use Cms\Classes\Theme;
 use Cms\Classes\CmsObject;
 use Cms\Classes\CmsCompoundObject;
+use October\Rain\Halcyon\Model;
 
 class TestCmsCompoundObject extends CmsCompoundObject
 {
@@ -25,10 +26,12 @@ class TestTemporaryCmsCompoundObject extends CmsCompoundObject
 
 class CmsCompoundObjectTest extends TestCase
 {
-    public function tearDown()
+    public function setUp()
     {
-        parent::tearDown();
-        TestCmsCompoundObject::flushEventListeners();
+        parent::setUp();
+
+        Model::clearBootedModels();
+        Model::flushEventListeners();
     }
 
     public function testLoadFile()
diff --git a/tests/unit/cms/classes/CmsObjectQueryTest.php b/tests/unit/cms/classes/CmsObjectQueryTest.php
index 7ae39aa17..d9b3c57e3 100644
--- a/tests/unit/cms/classes/CmsObjectQueryTest.php
+++ b/tests/unit/cms/classes/CmsObjectQueryTest.php
@@ -3,6 +3,7 @@
 use Cms\Classes\Page;
 use Cms\Classes\Theme;
 use Cms\Classes\Layout;
+use October\Rain\Halcyon\Model;
 
 class CmsObjectQueryTest extends TestCase
 {
@@ -10,10 +11,8 @@ class CmsObjectQueryTest extends TestCase
     {
         parent::setUp();
 
-        // Register theme with Halcyon
-        Theme::load('test');
-
-        TestCmsCompoundObject::flushEventListeners();
+        Model::clearBootedModels();
+        Model::flushEventListeners();
     }
 
     public function testWhere()
diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index 66e468369..c5814b503 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -2,14 +2,16 @@
 
 use Cms\Classes\Theme;
 use Cms\Classes\Controller;
-use Cms\Classes\CmsCompoundObject;
+use October\Rain\Halcyon\Model;
 
 class ControllerTest extends TestCase
 {
-    public function tearDown()
+    public function setUp()
     {
-        parent::tearDown();
-        CmsCompoundObject::flushEventListeners();
+        parent::setUp();
+
+        Model::clearBootedModels();
+        Model::flushEventListeners();
     }
 
     public function testThemeUrl()