Merge branch 'develop' into multiple-connections

Conflicts:
	test/test_classes.php
	test/test_queries.php

1 files changed, 14 insertions, 0 deletions

diff --git a/test/IdiormResultSetTest.php b/test/IdiormResultSetTest.php
index 34d42a0..f41205a 100644
--- a/test/IdiormResultSetTest.php
+++ b/test/IdiormResultSetTest.php
@@ -2,6 +2,20 @@
 
 class IdiormResultSetTest extends PHPUnit_Framework_TestCase {
 
+    public function setUp() {
+        // Enable logging
+        ORM::configure('logging', true);
+
+        // Set up the dummy database connection
+        $db = new MockPDO('sqlite::memory:');
+        ORM::set_db($db);
+    }
+
+    public function tearDown() {
+        ORM::configure('logging', false);
+        ORM::set_db(null);
+    }
+
     public function testGet() {
         $IdiormResultSet = new IdiormResultSet();
         $this->assertInternalType('array', $IdiormResultSet->get_results());