test improvements

boxfrommars · Apr 25, 2015 · 0811d82 · 0811d82
1 parent 8d51f7f
commit 0811d82
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 50 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -12,7 +12,7 @@
 >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/SortableGroupTraitTest.php b/tests/SortableGroupTraitTest.php
@@ -1,41 +1,19 @@
 <?php
 
-require_once 'stubs/SortableEntity.php';
+require_once 'stubs/SortableGroupEntity.php';
+require_once 'SortableTestBase.php';
 
-class SortableGroupTraitTest extends Orchestra\Testbench\TestCase
+class SortableGroupTraitTest extends SortableTestBase
 {
 
     public function setUp()
     {
         parent::setUp();
-        $artisan = $this->app->make('artisan');
-        $artisan->call(
-            'migrate',
-            array(
-                '--database' => 'testbench',
-                '--path' => '../tests/migrations',
-            )
-        );
 
         // fix for "Eloquent model events are not triggered when testing" https://github.com/laravel/framework/issues/1181
         SortableEntityGroup::boot();
     }
 
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['path.base'] = __DIR__ . '/../src';
-
-        $app['config']->set('database.default', 'testbench');
-        $app['config']->set(
-            'database.connections.testbench',
-            array(
-                'driver' => 'sqlite',
-                'database' => ':memory:',
-                'prefix' => '',
-            )
-        );
-    }
-
     public function testGroupName()
     {
         $this->assertEquals('category', SortableEntityGroup::getSortableGroupField());

diff --git a/tests/SortableTestBase.php b/tests/SortableTestBase.php
@@ -0,0 +1,32 @@
+<?php
+
+class SortableTestBase extends Orchestra\Testbench\TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $artisan = $this->app->make('artisan');
+        $artisan->call(
+            'migrate',
+            array(
+                '--database' => 'testbench',
+                '--path' => '../tests/migrations',
+            )
+        );
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['path.base'] = __DIR__ . '/../src';
+
+        $app['config']->set('database.default', 'testbench');
+        $app['config']->set(
+            'database.connections.testbench',
+            array(
+                'driver' => 'sqlite',
+                'database' => ':memory:',
+                'prefix' => '',
+            )
+        );
+    }
+}
diff --git a/tests/SortableTraitTest.php b/tests/SortableTraitTest.php
@@ -1,41 +1,19 @@
 <?php
 
 require_once 'stubs/SortableEntity.php';
+require_once 'SortableTestBase.php';
 
-class SortableTraitTest extends Orchestra\Testbench\TestCase
+class SortableTraitTest extends SortableTestBase
 {
 
     public function setUp()
     {
         parent::setUp();
-        $artisan = $this->app->make('artisan');
-        $artisan->call(
-            'migrate',
-            array(
-                '--database' => 'testbench',
-                '--path' => '../tests/migrations',
-            )
-        );
 
         // fix for "Eloquent model events are not triggered when testing" https://github.com/laravel/framework/issues/1181
         SortableEntity::boot();
     }
 
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['path.base'] = __DIR__ . '/../src';
-
-        $app['config']->set('database.default', 'testbench');
-        $app['config']->set(
-            'database.connections.testbench',
-            array(
-                'driver' => 'sqlite',
-                'database' => ':memory:',
-                'prefix' => '',
-            )
-        );
-    }
-
     public function testPositionOnCreate()
     {
         $entity = new SortableEntity();