Conflict merge error.

thephpleague · Jul 4, 2014 · c4f29e2 · c4f29e2
1 parent 1d2fbf4
commit c4f29e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Zizaco/FactoryMuff/Kind/Generic.php b/src/Zizaco/FactoryMuff/Kind/Generic.php
@@ -2,6 +2,7 @@
 
 namespace Zizaco\FactoryMuff\Kind;
 
+use InvalidArgumentException;
 use Zizaco\FactoryMuff\Kind;
 
 class Generic extends Kind

diff --git a/tests/FactoryMuffTest.php b/tests/FactoryMuffTest.php
@@ -167,6 +167,14 @@ public function test_should_create_based_on_define_declaration()
         $obj = $this->factory->create('SampleModelA');
 
         $this->assertEquals('just a string', $obj->text);
+
+        $this->factory->define('SampleModelA', array(
+            'text' => 'sneakyString',
+        ));
+
+        $obj = $this->factory->create('SampleModelA');
+
+        $this->assertEquals('sneakyString', $obj->text);
     }
 
     public function test_faker_default_boolean()