Skip to content

Commit

Permalink
Merge branch '3.1' into 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed Dec 19, 2015
2 parents a8603f1 + 01b7a0f commit c34db97
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ title: Testbench Change Log

## Version 3.1 {#v3-1}

### v3.1.7 {#v3-1-7}

* Bump to Laravel Framework v5.1.27.
* Add `Orchestra\Testbench\Traits\WithFactories` trait to allow packages to load model factories when running packages test suite.

### v3.1.6 {#v3-1-6}

* Update Laravel configuration fixtures.
Expand Down
2 changes: 1 addition & 1 deletion src/Traits/WithFactories.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trait WithFactories
*
* @return $this
*/
protected function withModelFactories($path)
protected function withFactories($path)
{
$this->app->make(ModelFactory::class)->load($path);

Expand Down

0 comments on commit c34db97

Please sign in to comment.