Fix tests (#1724)

*   Update Dockerfile, add for methods setUp and tearDown return type hint in all tests, replace fire on dispatch

* Resolve error test with touch

* Use COMPOSER_VERSION in Dockerfile

* Add alias for composer

* Change parent method's names
Broken commit in laravel: laravel/framework@2ee1892

* Remove changes in .travis.yml

* Remove changes from Dockerfile

* Revert changes in docker-compose.yml

* Update image with mysql

Author: Smolevich

docker-compose.yml

@@ -16,7 +16,7 @@ services:
 
     mysql:
         container_name: mysql
-        image: mysql
+        image: mysql:5.7
         environment:
             MYSQL_ROOT_PASSWORD:
             MYSQL_DATABASE: unittest

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -177,6 +177,31 @@ public function raw($expression = null)
         return $results;
     }
 
+    /**
+     * Add the "updated at" column to an array of values.
+     * TODO Remove if https://github.com/laravel/framework/commit/6484744326531829341e1ff886cc9b628b20d73e
+     * wiil be reverted
+     * Issue in laravel frawework https://github.com/laravel/framework/issues/27791
+     *
+     * @param  array  $values
+     * @return array
+     */
+    protected function addUpdatedAtColumn(array $values)
+    {
+        if (! $this->model->usesTimestamps() ||
+            is_null($this->model->getUpdatedAtColumn())) {
+            return $values;
+        }
+
+        $column = $this->model->getUpdatedAtColumn();
+        $values = array_merge(
+            [$column => $this->model->freshTimestampString()],
+            $values
+        );
+
+        return $values;
+    }
+
     /**
      * @return \Illuminate\Database\ConnectionInterface
      */

src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php

@@ -110,7 +110,7 @@ protected function getRelatedConstraintKey($relation)
         }
 
         if ($relation instanceof BelongsTo) {
-            return $relation->getForeignKey();
+            return $relation->getForeignKeyName();
         }
 
         if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation)) {
@@ -130,7 +130,7 @@ protected function getHasCompareKey($relation)
             return $relation->getHasCompareKey();
         }
 
-        return $relation instanceof HasOneOrMany ? $relation->getForeignKeyName() : $relation->getOwnerKey();
+        return $relation instanceof HasOneOrMany ? $relation->getForeignKeyName() : $relation->getOwnerKeyName();
     }
 
     /**

tests/AuthTest.php

@@ -5,8 +5,9 @@
 
 class AuthTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
+        parent::setUp();
         User::truncate();
         DB::collection('password_reminders')->truncate();
     }

tests/EmbeddedRelationsTest.php

@@ -2,7 +2,7 @@
 
 class EmbeddedRelationsTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
 
@@ -21,11 +21,11 @@ public function testEmbedsManySave()
         $address = new Address(['city' => 'London']);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($address), $address);
-        $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.created: ' . get_class($address), $address);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($address), $address);
 
         $address = $user->addresses()->save($address);
         $address->unsetEventDispatcher();
@@ -47,11 +47,11 @@ public function testEmbedsManySave()
         $this->assertEquals(['London', 'Paris'], $user->addresses->pluck('city')->all());
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.updated: ' . get_class($address), $address);
-        $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.updated: ' . get_class($address), $address);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($address), $address);
 
         $address->city = 'New York';
         $user->addresses()->save($address);
@@ -94,16 +94,16 @@ public function testEmbedsManySave()
     //     $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
     //     $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
     //     $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(true);
-    //     $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($address), $address);
-    //     $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
+    //     $events->shouldReceive('dispatch')->once()->with('eloquent.created: ' . get_class($address), $address);
+    //     $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($address), $address);
 
     //     $address->save();
 
     //     $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
     //     $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
     //     $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(true);
-    //     $events->shouldReceive('fire')->once()->with('eloquent.updated: ' . get_class($address), $address);
-    //     $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
+    //     $events->shouldReceive('dispatch')->once()->with('eloquent.updated: ' . get_class($address), $address);
+    //     $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($address), $address);
 
     //     $address->city = 'Paris';
     //     $address->save();
@@ -213,9 +213,9 @@ public function testEmbedsManyDestroy()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::type('Address'))->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
+        $events->shouldReceive('dispatch')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
 
         $user->addresses()->destroy($address->_id);
         $this->assertEquals(['Bristol', 'Bruxelles'], $user->addresses->pluck('city')->all());
@@ -252,9 +252,9 @@ public function testEmbedsManyDelete()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::type('Address'))->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
+        $events->shouldReceive('dispatch')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
 
         $address->delete();
 
@@ -301,7 +301,7 @@ public function testEmbedsManyCreatingEventReturnsFalse()
         $address = new Address(['city' => 'London']);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(false);
 
@@ -316,7 +316,7 @@ public function testEmbedsManySavingEventReturnsFalse()
         $address->exists = true;
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(false);
 
         $this->assertFalse($user->addresses()->save($address));
@@ -330,7 +330,7 @@ public function testEmbedsManyUpdatingEventReturnsFalse()
         $user->addresses()->save($address);
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(false);
 
@@ -348,7 +348,7 @@ public function testEmbedsManyDeletingEventReturnsFalse()
         $address = $user->addresses->first();
 
         $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($address), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::mustBe($address))->andReturn(false);
 
         $this->assertEquals(0, $user->addresses()->destroy($address));
@@ -452,11 +452,11 @@ public function testEmbedsOne()
         $father = new User(['name' => 'Mark Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($father), $father)->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($father), $father);
-        $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.created: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($father), $father);
 
         $father = $user->father()->save($father);
         $father->unsetEventDispatcher();
@@ -472,11 +472,11 @@ public function testEmbedsOne()
         $this->assertInstanceOf('MongoDB\BSON\ObjectID', $raw['_id']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($father), $father)->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.updated: ' . get_class($father), $father);
-        $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.updated: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($father), $father);
 
         $father->name = 'Tom Doe';
         $user->father()->save($father);
@@ -488,11 +488,11 @@ public function testEmbedsOne()
         $father = new User(['name' => 'Jim Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($father), $father)->andReturn(true);
         $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($father), $father)->andReturn(true);
-        $events->shouldReceive('fire')->once()->with('eloquent.created: ' . get_class($father), $father);
-        $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.created: ' . get_class($father), $father);
+        $events->shouldReceive('dispatch')->once()->with('eloquent.saved: ' . get_class($father), $father);
 
         $father = $user->father()->save($father);
         $father->unsetEventDispatcher();
@@ -507,7 +507,7 @@ public function testEmbedsOneAssociate()
         $father = new User(['name' => 'Mark Doe']);
 
         $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
-        $events->shouldReceive('fire')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
+        $events->shouldReceive('dispatch')->with('eloquent.retrieved: ' . get_class($father), Mockery::any());
         $events->shouldReceive('until')->times(0)->with('eloquent.saving: ' . get_class($father), $father);
 
         $father = $user->father()->associate($father);

tests/GeospatialTest.php

@@ -2,7 +2,7 @@
 
 class GeospatialTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -43,7 +43,7 @@ public function setUp()
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Schema::drop('locations');
     }

tests/HybridRelationsTest.php

@@ -2,7 +2,7 @@
 
 class HybridRelationsTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -11,7 +11,7 @@ public function setUp()
         MysqlRole::executeSchema();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         MysqlUser::truncate();
         MysqlBook::truncate();

tests/ModelTest.php

@@ -8,7 +8,7 @@
 
 class ModelTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         User::truncate();
         Soft::truncate();
@@ -262,7 +262,6 @@ public function testTouch()
         $user->save();
 
         $old = $user->updated_at;
-
         sleep(1);
         $user->touch();
         $check = User::find($user->_id);

tests/QueryBuilderTest.php

@@ -5,7 +5,7 @@
 
 class QueryBuilderTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         DB::collection('users')->truncate();
         DB::collection('items')->truncate();

tests/QueryTest.php

@@ -4,7 +4,7 @@ class QueryTest extends TestCase
 {
     protected static $started = false;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         User::create(['name' => 'John Doe', 'age' => 35, 'title' => 'admin']);
@@ -18,7 +18,7 @@ public function setUp()
         User::create(['name' => 'Error', 'age' => null, 'title' => null]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         User::truncate();
         parent::tearDown();