From 39bdf1898695085d322135f93f1421ca50b6a512 Mon Sep 17 00:00:00 2001
From: Makis Tracend <makis.tracend@gmail.com>
Date: Fri, 15 Jun 2012 15:07:44 -0700
Subject: [PATCH] #43 Adding mockery reference / Minor tweaks in the unit tests

---
 composer.json    | 5 +----
 test/main.php    | 6 ++++--
 test/phpunit.xml | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 15c1477..f73d149 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,5 @@
             "type": "vcs",
             "url": "http://github.com/makesites/kisscms"
         }
-    ],
-    "autoload": {
-        "psr-0": {"KISSCMS": "./"}
-    }
+    ]
 }
\ No newline at end of file
diff --git a/test/main.php b/test/main.php
index fb96d93..bc8bc39 100755
--- a/test/main.php
+++ b/test/main.php
@@ -1,6 +1,8 @@
 <?php
 
-class Main extends PHPUnit_Framework_TestCase
+use Mockery as m;
+
+class MainTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var PDO
@@ -14,7 +16,7 @@ public function setUp()
 
     public function tearDown()
     {
-        
+        m::close();
     }
 
     public function testMain()
diff --git a/test/phpunit.xml b/test/phpunit.xml
index 6fef236..cef8541 100755
--- a/test/phpunit.xml
+++ b/test/phpunit.xml
@@ -12,8 +12,8 @@
          syntaxCheck="false"
 >
     <testsuites>
-        <testsuite name="Main">
-            <directory>./</directory>
+        <testsuite name="KISSCMS Test Suite">
+            <directory>../test/</directory>
         </testsuite>
     </testsuites>
 
@@ -21,9 +21,9 @@
         <whitelist>
             <directory>../</directory>
             <exclude>
-                <directory>../test</directory>
+                <directory>../test/</directory>
             </exclude>
         </whitelist>
     </filter>
 	
-</phpunit>
+</phpunit>
\ No newline at end of file