Merge branch '3.1' into 3.2

# Conflicts:
#	tests/BehatFeatureContextTest.php
#	tests/RouteTest.php

Signed-off-by: crynobone <crynobone@gmail.com>

src/TestCase.php

@@ -170,6 +170,24 @@ protected function afterApplicationCreated(callable $callback)
         }
     }
 
+    /**
+     * Define hooks to migrate the database before and after each test.
+     *
+     * @param  string  $realpah
+     *
+     * @return void
+     */
+    protected function loadMigrationsFrom($realpath)
+    {
+        $this->artisan('migrate', [
+            '--realpath' => $realpath,
+        ]);
+
+        $this->beforeApplicationDestroyed(function () {
+            $this->artisan('migrate:rollback');
+        });
+    }
+
     /**
      * Register a callback to be run before the application is destroyed.
      *

tests/DatabaseLoadMigrationTest.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Orchestra\Testbench\TestCase;
+
+class DatabaseLoadMigrationsTest extends \Orchestra\Testbench\TestCase
+{
+    /**
+     * Setup the test environment.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        // uncomment to enable route filters if your package defines routes with filters
+        // $this->app['router']->enableFilters();
+
+        // call migrations for packages upon which our package depends, e.g. Cartalyst/Sentry
+        // not necessary if your package doesn't depend on another package that requires
+        // running migrations for proper installation
+        /* uncomment as necessary
+        $this->artisan('migrate', [
+            '--database' => 'testbench',
+            '--path'     => '../vendor/cartalyst/sentry/src/migrations',
+        ]);
+        */
+        $this->loadMigrationsFrom(realpath(__DIR__.'/migrations'));
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('database.default', 'testing');
+    }
+
+    /**
+     * Get package providers.  At a minimum this is the package being tested, but also
+     * would include packages upon which our package depends, e.g. Cartalyst/Sentry
+     * In a normal app environment these would be added to the 'providers' array in
+     * the config/app.php file.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            //'Cartalyst\Sentry\SentryServiceProvider',
+            //'YourProject\YourPackage\YourPackageServiceProvider',
+        ];
+    }
+
+    /**
+     * Get package aliases.  In a normal app environment these would be added to
+     * the 'aliases' array in the config/app.php file.  If your package exposes an
+     * aliased facade, you should add the alias here, along with aliases for
+     * facades upon which your package depends, e.g. Cartalyst/Sentry.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     *
+     * @return array
+     */
+    protected function getPackageAliases($app)
+    {
+        return [
+            //'Sentry'      => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            //'YourPackage' => 'YourProject\YourPackage\Facades\YourPackage',
+        ];
+    }
+
+    /**
+     * Test running migration.
+     *
+     * @test
+     */
+    public function testRunningMigration()
+    {
+        $users = \DB::table('users')->where('id', '=', 1)->first();
+
+        $this->assertEquals('hello@orchestraplatform.com', $users->email);
+        $this->assertTrue(\Hash::check('123', $users->password));
+
+        $this->beforeApplicationDestroyed(function () {
+            $this->assertSame(\Schema::hasTable('users'), false);
+        });
+    }
+}

tests/Integrations/AggregateServiceProviderTest.php

@@ -37,7 +37,6 @@ public function testServiceIsAvailable()
     }
 }
 
-
 class ParentService extends AggregateServiceProvider
 {
     protected $providers = [
@@ -69,4 +68,4 @@ public function register()
     {
         $this->app['child.deferred.loaded'] = true;
     }
-}
+}

tests/RouteTest.php

@@ -48,7 +48,6 @@ public function testGetRoutes()
         $crawler = $this->call('GET', 'goodbye');
 
         $this->assertEquals('goodbye world', $crawler->getContent());
-
     }
 
     /**

tests/TestCaseTest.php

@@ -10,7 +10,7 @@ class TestCaseTest extends \PHPUnit_Framework_TestCase
     public function testCreateApplicationMethod()
     {
         $stub = new StubTestCase();
-        $app  = $stub->createApplication();
+        $app = $stub->createApplication();
 
         $this->assertInstanceOf('\Orchestra\Testbench\Contracts\TestCase', $stub);
         $this->assertInstanceOf('\Illuminate\Foundation\Application', $app);