#43 Adding mockery reference / Minor tweaks in the unit tests

makesites · Jun 15, 2012 · 39bdf18 · 39bdf18
1 parent 7d30502
commit 39bdf18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -24,8 +24,5 @@
             "type": "vcs",
             "url": "http://github.com/makesites/kisscms"
         }
-    ],
-    "autoload": {
-        "psr-0": {"KISSCMS": "./"}
-    }
+    ]
 }
diff --git 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
@@ -12,18 +12,18 @@
          syntaxCheck="false"
 >
     <testsuites>
-        <testsuite name="Main">
-            <directory>./</directory>
+        <testsuite name="KISSCMS Test Suite">
+            <directory>../test/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory>../</directory>
             <exclude>
-                <directory>../test</directory>
+                <directory>../test/</directory>
             </exclude>
         </whitelist>
     </filter>
 
-</phpunit>
+</phpunit>