Merge branch '3.1' into 3.2

# Conflicts:
#	composer.json
#	src/TestCase.php

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

composer.json

@@ -20,6 +20,7 @@
         "php": ">=5.5.0",
         "laravel/framework": "~5.2.0",
         "orchestra/database": "~3.2.0",
+        "fzaninotto/faker": "~1.4",
         "symfony/css-selector": "2.8.*|3.0.*",
         "symfony/dom-crawler": "2.8.*|3.0.*"
     },

src/TestCaseInterface.php → src/Contracts/TestCase.php

@@ -1,8 +1,8 @@
-<?php namespace Orchestra\Testbench;
+<?php namespace Orchestra\Testbench\Contracts;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 
-interface TestCaseInterface
+interface TestCase
 {
     /**
      * Assert that the session has a given list of values.

src/TestCase.php

@@ -1,16 +1,18 @@
 <?php namespace Orchestra\Testbench;
 
 use Mockery;
+use Orchestra\Testbench\Traits\WithFactories;
 use Orchestra\Testbench\Traits\ApplicationTrait;
 use Illuminate\Foundation\Testing\Concerns\ImpersonatesUsers;
 use Illuminate\Foundation\Testing\Concerns\MakesHttpRequests;
+use Orchestra\Testbench\Contracts\TestCase as TestCaseContract;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithConsole;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithSession;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithDatabase;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
 use Illuminate\Foundation\Testing\Concerns\MocksApplicationServices;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestCaseInterface
+abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestCaseContract
 {
     use ApplicationTrait,
         InteractsWithContainer,
@@ -19,7 +21,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestCaseI
         InteractsWithConsole,
         InteractsWithDatabase,
         InteractsWithSession,
-        MocksApplicationServices;
+        MocksApplicationServices,
+        WithFactories;
 
     /**
      * The Illuminate application instance.

src/Traits/WithFactories.php

@@ -0,0 +1,20 @@
+<?php namespace Orchestra\Testbench\Traits;
+
+use Illuminate\Database\Eloquent\Factory as ModelFactory;
+
+trait WithFactories
+{
+    /**
+     * Load model factories from path.
+     *
+     * @param  string  $path
+     *
+     * @return $this
+     */
+    protected function withModelFactories($path)
+    {
+        $this->app->make(ModelFactory::class)->load($path);
+
+        return $this;
+    }
+}