Fixed tests

Author: stevebauman

tests/Models/ModelEventTest.php

@@ -30,11 +30,13 @@ protected function setUp()
         Container::unsetEventDispatcher();
     }
 
-    public function test_save_fires_events()
+    public function test_save_fires_saving_and_create_events()
     {
         $dispatcher = m::mock(DispatcherInterface::class)->makePartial();
         $dispatcher->shouldReceive('fire')->once()->withArgs([Saving::class]);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Creating::class]);
         $dispatcher->shouldReceive('fire')->once()->withArgs([Saved::class]);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Created::class]);
         Container::setEventDispatcher($dispatcher);
 
         $model = new ModelEventSaveStub();
@@ -44,7 +46,9 @@ public function test_save_fires_events()
     public function test_create_fires_events()
     {
         $dispatcher = m::mock(DispatcherInterface::class);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Saving::class]);
         $dispatcher->shouldReceive('fire')->once()->withArgs([Creating::class]);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Saved::class]);
         $dispatcher->shouldReceive('fire')->once()->withArgs([Created::class]);
         Container::setEventDispatcher($dispatcher);
 
@@ -60,13 +64,15 @@ public function test_create_fires_events()
         $model->setDn('cn=foo,dc=bar,dc=baz');
         $model->cn = 'foo';
         $model->objectclass = 'bar';
-        $this->assertTrue($model->create());
+        $this->assertTrue($model->save());
     }
 
     public function test_updating_model_fires_events()
     {
         $dispatcher = m::mock(DispatcherInterface::class);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Saving::class]);
         $dispatcher->shouldReceive('fire')->once()->withArgs([Updating::class]);
+        $dispatcher->shouldReceive('fire')->once()->withArgs([Saved::class]);
         $dispatcher->shouldReceive('fire')->once()->withArgs([Updated::class]);
         Container::setEventDispatcher($dispatcher);
 
@@ -108,8 +114,26 @@ public function test_deleting_model_fires_events()
 
 class ModelEventSaveStub extends Model
 {
-    public function create(array $attributes = [])
+    public function newQueryWithoutScopes()
+    {
+        return (new ModelQueryBuilderSaveStub(new Connection()))->setModel($this);
+    }
+
+    public function synchronize()
     {
         return true;
     }
 }
+
+class ModelQueryBuilderSaveStub extends Builder
+{
+    public function insert($dn, array $attributes)
+    {
+        return true;
+    }
+
+    public function update($dn, array $modifications)
+    {
+        return true;
+    }
+}

tests/Models/ModelQueryTest.php

@@ -109,7 +109,7 @@ public function test_create()
 
         $model->setDn('cn=foo,dc=bar,dc=baz');
         $model->fill(['cn' => 'foo', 'objectclass' => 'bar']);
-        $this->assertTrue($model->create());
+        $this->assertTrue($model->save());
     }
 
     public function test_create_without_connection()
@@ -168,8 +168,9 @@ public function test_update()
 
     public function test_update_without_existing_model()
     {
+        Container::addConnection(new Connection());
         $this->expectException(ModelDoesNotExistException::class);
-        $model = new Entry();
+        $model = new Entry(['objectclass' => 'foo', 'bar', 'cn' => 'baz']);
         $model->update();
     }
 

tests/Models/ModelTest.php

@@ -420,6 +420,12 @@ public function test_is_ancestor_of()
         $this->assertTrue($model->isAncestorOf($child));
     }
 
+    public function test_create_fills_attributes()
+    {
+        $model = ModelCreateTestStub::create(['foo' => ['bar']]);
+        $this->assertEquals(['foo' => ['bar']], $model->getAttributes());
+    }
+
     public function test_rename()
     {
         $model = new ModelRenameTestStub();
@@ -457,6 +463,14 @@ public function test_move()
     }
 }
 
+class ModelCreateTestStub extends Model
+{
+    public function save(array $attributes = [])
+    {
+        return true;
+    }
+}
+
 class ModelBootingTestStub extends Model
 {
     public static function isBooted()