Skip to content

L
laravel-mongodb
Commit bd26b77b authored by Jens Segers's avatar Jens Segers
Browse files
Options

Running tests on Laravel 5.1

parent 9737b9bb
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 104 deletions
composer.json
View file @ bd26b77b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"illuminate/events": "^5.0" "illuminate/events": "^5.0"
}, },
"require-dev": { "require-dev": {
"orchestra/testbench": "3.0.*", "orchestra/testbench": "~3.1.0",
"mockery/mockery": "*", "mockery/mockery": "*",
"satooshi/php-coveralls": "*" "satooshi/php-coveralls": "*"
}, },
......
src/Jenssegers/Mongodb/Model.php
View file @ bd26b77b
...@@ -196,17 +196,7 @@ abstract class Model extends BaseModel { ...@@ -196,17 +196,7 @@ abstract class Model extends BaseModel {
*/ */
protected function getDateFormat() protected function getDateFormat()
{ {
return 'Y-m-d H:i:s'; return $this->dateFormat ?: 'Y-m-d H:i:s';
}
/**
* Get a fresh timestamp for the model.
*
* @return MongoDate
*/
public function freshTimestamp()
{
return new MongoDate;
} }
/** /**
...@@ -216,9 +206,7 @@ abstract class Model extends BaseModel { ...@@ -216,9 +206,7 @@ abstract class Model extends BaseModel {
*/ */
public function getTable() public function getTable()
{ {
if (isset($this->collection)) return $this->collection; return $this->collection ?: parent::getTable();
return parent::getTable();
} }
/** /**
......
src/Jenssegers/Mongodb/Query/Builder.php
View file @ bd26b77b
...@@ -620,7 +620,7 @@ class Builder extends BaseBuilder { ...@@ -620,7 +620,7 @@ class Builder extends BaseBuilder {
return $item; return $item;
}); });
return $results->lists($column, $key); return $results->lists($column, $key)->all();
} }
return parent::lists($column, $key); return parent::lists($column, $key);
......
src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php
View file @ bd26b77b
...@@ -212,6 +212,11 @@ abstract class EmbedsOneOrMany extends Relation { ...@@ -212,6 +212,11 @@ abstract class EmbedsOneOrMany extends Relation {
*/ */
protected function getIdsArrayFrom($ids) protected function getIdsArrayFrom($ids)
{ {
if ($ids instanceof Collection)
{
$ids = $ids->all();
}
if ( ! is_array($ids)) $ids = [$ids]; if ( ! is_array($ids)) $ids = [$ids];
foreach ($ids as &$id) foreach ($ids as &$id)
......
tests/EmbeddedRelationsTest.php
View file @ bd26b77b
...@@ -21,17 +21,17 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -21,17 +21,17 @@ class EmbeddedRelationsTest extends TestCase {
$address = new Address(['city' => 'London']); $address = new Address(['city' => 'London']);
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.creating: '.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.created: ' . get_class($address), $address);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($address), $address); $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
$address = $user->addresses()->save($address); $address = $user->addresses()->save($address);
$address->unsetEventDispatcher(); $address->unsetEventDispatcher();
$this->assertNotNull($user->addresses); $this->assertNotNull($user->addresses);
$this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $user->addresses); $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $user->addresses);
$this->assertEquals(['London'], $user->addresses->lists('city')); $this->assertEquals(['London'], $user->addresses->lists('city')->all());
$this->assertInstanceOf('DateTime', $address->created_at); $this->assertInstanceOf('DateTime', $address->created_at);
$this->assertInstanceOf('DateTime', $address->updated_at); $this->assertInstanceOf('DateTime', $address->updated_at);
$this->assertNotNull($address->_id); $this->assertNotNull($address->_id);
...@@ -43,13 +43,13 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -43,13 +43,13 @@ class EmbeddedRelationsTest extends TestCase {
$address = $user->addresses()->save(new Address(['city' => 'Paris'])); $address = $user->addresses()->save(new Address(['city' => 'Paris']));
$user = User::find($user->_id); $user = User::find($user->_id);
$this->assertEquals(['London', 'Paris'], $user->addresses->lists('city')); $this->assertEquals(['London', 'Paris'], $user->addresses->lists('city')->all());
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.updating: '.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.updated: ' . get_class($address), $address);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($address), $address); $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
$address->city = 'New York'; $address->city = 'New York';
$user->addresses()->save($address); $user->addresses()->save($address);
...@@ -59,10 +59,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -59,10 +59,10 @@ class EmbeddedRelationsTest extends TestCase {
$this->assertEquals(2, count($user->addresses()->get())); $this->assertEquals(2, count($user->addresses()->get()));
$this->assertEquals(2, $user->addresses->count()); $this->assertEquals(2, $user->addresses->count());
$this->assertEquals(2, $user->addresses()->count()); $this->assertEquals(2, $user->addresses()->count());
$this->assertEquals(['London', 'New York'], $user->addresses->lists('city')); $this->assertEquals(['London', 'New York'], $user->addresses->lists('city')->all());
$freshUser = User::find($user->_id); $freshUser = User::find($user->_id);
$this->assertEquals(['London', 'New York'], $freshUser->addresses->lists('city')); $this->assertEquals(['London', 'New York'], $freshUser->addresses->lists('city')->all());
$address = $user->addresses->first(); $address = $user->addresses->first();
$this->assertEquals('London', $address->city); $this->assertEquals('London', $address->city);
...@@ -73,39 +73,39 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -73,39 +73,39 @@ class EmbeddedRelationsTest extends TestCase {
$user = User::find($user->_id); $user = User::find($user->_id);
$user->addresses()->save(new Address(['city' => 'Bruxelles'])); $user->addresses()->save(new Address(['city' => 'Bruxelles']));
$this->assertEquals(['London', 'New York', 'Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['London', 'New York', 'Bruxelles'], $user->addresses->lists('city')->all());
$address = $user->addresses[1]; $address = $user->addresses[1];
$address->city = "Manhattan"; $address->city = "Manhattan";
$user->addresses()->save($address); $user->addresses()->save($address);
$this->assertEquals(['London', 'Manhattan', 'Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['London', 'Manhattan', 'Bruxelles'], $user->addresses->lists('city')->all());
$freshUser = User::find($user->_id); $freshUser = User::find($user->_id);
$this->assertEquals(['London', 'Manhattan', 'Bruxelles'], $freshUser->addresses->lists('city')); $this->assertEquals(['London', 'Manhattan', 'Bruxelles'], $freshUser->addresses->lists('city')->all());
} }
public function testEmbedsManySaveModel() // public function testEmbedsManySaveModel()
{ // {
$user = User::create(['name' => 'John Doe']); // $user = User::create(['name' => 'John Doe']);
$address = new Address(['city' => 'London']); // $address = new Address(['city' => 'London']);
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); // $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.creating: '.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.created: ' . get_class($address), $address);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($address), $address); // $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
$address->save(); // $address->save();
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); // $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.updating: '.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.updated: ' . get_class($address), $address);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($address), $address); // $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($address), $address);
$address->city = 'Paris'; // $address->city = 'Paris';
$address->save(); // $address->save();
} // }
public function testEmbedsToArray() public function testEmbedsToArray()
{ {
...@@ -123,28 +123,28 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -123,28 +123,28 @@ class EmbeddedRelationsTest extends TestCase {
$address = new Address(['city' => 'London']); $address = new Address(['city' => 'London']);
$user->addresses()->associate($address); $user->addresses()->associate($address);
$this->assertEquals(['London'], $user->addresses->lists('city')); $this->assertEquals(['London'], $user->addresses->lists('city')->all());
$this->assertNotNull($address->_id); $this->assertNotNull($address->_id);
$freshUser = User::find($user->_id); $freshUser = User::find($user->_id);
$this->assertEquals([], $freshUser->addresses->lists('city')); $this->assertEquals([], $freshUser->addresses->lists('city')->all());
$address->city = 'Londinium'; $address->city = 'Londinium';
$user->addresses()->associate($address); $user->addresses()->associate($address);
$this->assertEquals(['Londinium'], $user->addresses->lists('city')); $this->assertEquals(['Londinium'], $user->addresses->lists('city')->all());
$freshUser = User::find($user->_id); $freshUser = User::find($user->_id);
$this->assertEquals([], $freshUser->addresses->lists('city')); $this->assertEquals([], $freshUser->addresses->lists('city')->all());
} }
public function testEmbedsManySaveMany() public function testEmbedsManySaveMany()
{ {
$user = User::create(['name' => 'John Doe']); $user = User::create(['name' => 'John Doe']);
$user->addresses()->saveMany([new Address(['city' => 'London']), new Address(['city' => 'Bristol'])]); $user->addresses()->saveMany([new Address(['city' => 'London']), new Address(['city' => 'Bristol'])]);
$this->assertEquals(['London', 'Bristol'], $user->addresses->lists('city')); $this->assertEquals(['London', 'Bristol'], $user->addresses->lists('city')->all());
$freshUser = User::find($user->id); $freshUser = User::find($user->id);
$this->assertEquals(['London', 'Bristol'], $freshUser->addresses->lists('city')); $this->assertEquals(['London', 'Bristol'], $freshUser->addresses->lists('city')->all());
} }
public function testEmbedsManyDuplicate() public function testEmbedsManyDuplicate()
...@@ -154,7 +154,7 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -154,7 +154,7 @@ class EmbeddedRelationsTest extends TestCase {
$user->addresses()->save($address); $user->addresses()->save($address);
$user->addresses()->save($address); $user->addresses()->save($address);
$this->assertEquals(1, $user->addresses->count()); $this->assertEquals(1, $user->addresses->count());
$this->assertEquals(['London'], $user->addresses->lists('city')); $this->assertEquals(['London'], $user->addresses->lists('city')->all());
$user = User::find($user->id); $user = User::find($user->id);
$this->assertEquals(1, $user->addresses->count()); $this->assertEquals(1, $user->addresses->count());
...@@ -162,11 +162,11 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -162,11 +162,11 @@ class EmbeddedRelationsTest extends TestCase {
$address->city = 'Paris'; $address->city = 'Paris';
$user->addresses()->save($address); $user->addresses()->save($address);
$this->assertEquals(1, $user->addresses->count()); $this->assertEquals(1, $user->addresses->count());
$this->assertEquals(['Paris'], $user->addresses->lists('city')); $this->assertEquals(['Paris'], $user->addresses->lists('city')->all());
$user->addresses()->create(['_id' => $address->_id, 'city' => 'Bruxelles']); $user->addresses()->create(['_id' => $address->_id, 'city' => 'Bruxelles']);
$this->assertEquals(1, $user->addresses->count()); $this->assertEquals(1, $user->addresses->count());
$this->assertEquals(['Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['Bruxelles'], $user->addresses->lists('city')->all());
} }
public function testEmbedsManyCreate() public function testEmbedsManyCreate()
...@@ -175,13 +175,13 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -175,13 +175,13 @@ class EmbeddedRelationsTest extends TestCase {
$address = $user->addresses()->create(['city' => 'Bruxelles']); $address = $user->addresses()->create(['city' => 'Bruxelles']);
$this->assertInstanceOf('Address', $address); $this->assertInstanceOf('Address', $address);
$this->assertTrue(is_string($address->_id)); $this->assertTrue(is_string($address->_id));
$this->assertEquals(['Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['Bruxelles'], $user->addresses->lists('city')->all());
$raw = $address->getAttributes(); $raw = $address->getAttributes();
$this->assertInstanceOf('MongoId', $raw['_id']); $this->assertInstanceOf('MongoId', $raw['_id']);
$freshUser = User::find($user->id); $freshUser = User::find($user->id);
$this->assertEquals(['Bruxelles'], $freshUser->addresses->lists('city')); $this->assertEquals(['Bruxelles'], $freshUser->addresses->lists('city')->all());
$user = User::create([]); $user = User::create([]);
$address = $user->addresses()->create(['_id' => '', 'city' => 'Bruxelles']); $address = $user->addresses()->create(['_id' => '', 'city' => 'Bruxelles']);
...@@ -197,10 +197,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -197,10 +197,10 @@ class EmbeddedRelationsTest extends TestCase {
list($bruxelles, $paris) = $user->addresses()->createMany([['city' => 'Bruxelles'], ['city' => 'Paris']]); list($bruxelles, $paris) = $user->addresses()->createMany([['city' => 'Bruxelles'], ['city' => 'Paris']]);
$this->assertInstanceOf('Address', $bruxelles); $this->assertInstanceOf('Address', $bruxelles);
$this->assertEquals('Bruxelles', $bruxelles->city); $this->assertEquals('Bruxelles', $bruxelles->city);
$this->assertEquals(['Bruxelles', 'Paris'], $user->addresses->lists('city')); $this->assertEquals(['Bruxelles', 'Paris'], $user->addresses->lists('city')->all());
$freshUser = User::find($user->id); $freshUser = User::find($user->id);
$this->assertEquals(['Bruxelles', 'Paris'], $freshUser->addresses->lists('city')); $this->assertEquals(['Bruxelles', 'Paris'], $freshUser->addresses->lists('city')->all());
} }
public function testEmbedsManyDestroy() public function testEmbedsManyDestroy()
...@@ -211,34 +211,34 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -211,34 +211,34 @@ class EmbeddedRelationsTest extends TestCase {
$address = $user->addresses->first(); $address = $user->addresses->first();
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.deleting: '.get_class($address), Mockery::type('Address'))->andReturn(true); $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('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
$user->addresses()->destroy($address->_id); $user->addresses()->destroy($address->_id);
$this->assertEquals(['Bristol', 'Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['Bristol', 'Bruxelles'], $user->addresses->lists('city')->all());
$address->unsetEventDispatcher(); $address->unsetEventDispatcher();
$address = $user->addresses->first(); $address = $user->addresses->first();
$user->addresses()->destroy($address); $user->addresses()->destroy($address);
$this->assertEquals(['Bruxelles'], $user->addresses->lists('city')); $this->assertEquals(['Bruxelles'], $user->addresses->lists('city')->all());
$user->addresses()->create(['city' => 'Paris']); $user->addresses()->create(['city' => 'Paris']);
$user->addresses()->create(['city' => 'San Francisco']); $user->addresses()->create(['city' => 'San Francisco']);
$freshUser = User::find($user->id); $freshUser = User::find($user->id);
$this->assertEquals(['Bruxelles', 'Paris', 'San Francisco'], $freshUser->addresses->lists('city')); $this->assertEquals(['Bruxelles', 'Paris', 'San Francisco'], $freshUser->addresses->lists('city')->all());
$ids = $user->addresses->lists('_id'); $ids = $user->addresses->lists('_id');
$user->addresses()->destroy($ids); $user->addresses()->destroy($ids);
$this->assertEquals([], $user->addresses->lists('city')); $this->assertEquals([], $user->addresses->lists('city')->all());
$freshUser = User::find($user->id); $freshUser = User::find($user->id);
$this->assertEquals([], $freshUser->addresses->lists('city')); $this->assertEquals([], $freshUser->addresses->lists('city')->all());
list($london, $bristol, $bruxelles) = $user->addresses()->saveMany([new Address(['city' => 'London']), new Address(['city' => 'Bristol']), new Address(['city' => 'Bruxelles'])]); list($london, $bristol, $bruxelles) = $user->addresses()->saveMany([new Address(['city' => 'London']), new Address(['city' => 'Bristol']), new Address(['city' => 'Bruxelles'])]);
$user->addresses()->destroy([$london, $bruxelles]); $user->addresses()->destroy([$london, $bruxelles]);
$this->assertEquals(['Bristol'], $user->addresses->lists('city')); $this->assertEquals(['Bristol'], $user->addresses->lists('city')->all());
} }
public function testEmbedsManyDelete() public function testEmbedsManyDelete()
...@@ -249,8 +249,8 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -249,8 +249,8 @@ class EmbeddedRelationsTest extends TestCase {
$address = $user->addresses->first(); $address = $user->addresses->first();
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.deleting: '.get_class($address), Mockery::type('Address'))->andReturn(true); $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('fire')->once()->with('eloquent.deleted: ' . get_class($address), Mockery::type('Address'));
$address->delete(); $address->delete();
...@@ -285,10 +285,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -285,10 +285,10 @@ class EmbeddedRelationsTest extends TestCase {
$address = new Address(['city' => 'London']); $address = new Address(['city' => 'London']);
$address = $user->addresses()->attach($address); $address = $user->addresses()->attach($address);
$this->assertEquals(['London'], $user->addresses->lists('city')); $this->assertEquals(['London'], $user->addresses->lists('city')->all());
$user->addresses()->detach($address); $user->addresses()->detach($address);
$this->assertEquals([], $user->addresses->lists('city')); $this->assertEquals([], $user->addresses->lists('city')->all());
} }
public function testEmbedsManyCreatingEventReturnsFalse() public function testEmbedsManyCreatingEventReturnsFalse()
...@@ -297,8 +297,8 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -297,8 +297,8 @@ class EmbeddedRelationsTest extends TestCase {
$address = new Address(['city' => 'London']); $address = new Address(['city' => 'London']);
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.creating: '.get_class($address), $address)->andReturn(false); $events->shouldReceive('until')->once()->with('eloquent.creating: ' . get_class($address), $address)->andReturn(false);
$this->assertFalse($user->addresses()->save($address)); $this->assertFalse($user->addresses()->save($address));
$address->unsetEventDispatcher(); $address->unsetEventDispatcher();
...@@ -311,7 +311,7 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -311,7 +311,7 @@ class EmbeddedRelationsTest extends TestCase {
$address->exists = true; $address->exists = true;
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.saving: '.get_class($address), $address)->andReturn(false); $events->shouldReceive('until')->once()->with('eloquent.saving: ' . get_class($address), $address)->andReturn(false);
$this->assertFalse($user->addresses()->save($address)); $this->assertFalse($user->addresses()->save($address));
$address->unsetEventDispatcher(); $address->unsetEventDispatcher();
...@@ -324,8 +324,8 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -324,8 +324,8 @@ class EmbeddedRelationsTest extends TestCase {
$user->addresses()->save($address); $user->addresses()->save($address);
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $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.saving: ' . get_class($address), $address)->andReturn(true);
$events->shouldReceive('until')->once()->with('eloquent.updating: '.get_class($address), $address)->andReturn(false); $events->shouldReceive('until')->once()->with('eloquent.updating: ' . get_class($address), $address)->andReturn(false);
$address->city = 'Warsaw'; $address->city = 'Warsaw';
...@@ -341,10 +341,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -341,10 +341,10 @@ class EmbeddedRelationsTest extends TestCase {
$address = $user->addresses->first(); $address = $user->addresses->first();
$address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $address->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.deleting: '.get_class($address), Mockery::mustBe($address))->andReturn(false); $events->shouldReceive('until')->once()->with('eloquent.deleting: ' . get_class($address), Mockery::mustBe($address))->andReturn(false);
$this->assertEquals(0, $user->addresses()->destroy($address)); $this->assertEquals(0, $user->addresses()->destroy($address));
$this->assertEquals(['New York'], $user->addresses->lists('city')); $this->assertEquals(['New York'], $user->addresses->lists('city')->all());
$address->unsetEventDispatcher(); $address->unsetEventDispatcher();
} }
...@@ -421,14 +421,14 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -421,14 +421,14 @@ class EmbeddedRelationsTest extends TestCase {
$user->addresses()->save(new Address(['city' => 'Brussels', 'country' => 'Belgium', 'visited' => 2, 'created_at' => new DateTime('4 days ago')])); $user->addresses()->save(new Address(['city' => 'Brussels', 'country' => 'Belgium', 'visited' => 2, 'created_at' => new DateTime('4 days ago')]));
$user->addresses()->save(new Address(['city' => 'Ghent', 'country' => 'Belgium', 'visited' => 13, 'created_at' => new DateTime('2 days ago')])); $user->addresses()->save(new Address(['city' => 'Ghent', 'country' => 'Belgium', 'visited' => 13, 'created_at' => new DateTime('2 days ago')]));
$this->assertEquals(['Paris', 'Bruges', 'Brussels', 'Ghent'], $user->addresses()->lists('city')); $this->assertEquals(['Paris', 'Bruges', 'Brussels', 'Ghent'], $user->addresses()->lists('city')->all());
$this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->sortBy('city')->lists('city')); $this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->sortBy('city')->lists('city')->all());
$this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->orderBy('city')->lists('city')); $this->assertEquals(['Bruges', 'Brussels', 'Ghent', 'Paris'], $user->addresses()->orderBy('city')->lists('city')->all());
$this->assertEquals(['Paris', 'Ghent', 'Brussels', 'Bruges'], $user->addresses()->orderBy('city', 'desc')->lists('city')); $this->assertEquals(['Paris', 'Ghent', 'Brussels', 'Bruges'], $user->addresses()->orderBy('city', 'desc')->lists('city')->all());
$this->assertEquals([], $user->addresses()->where('city', 'New York')->lists('city')); $this->assertEquals([], $user->addresses()->where('city', 'New York')->lists('city')->all());
$this->assertEquals(['Bruges', 'Brussels', 'Ghent'], $user->addresses()->where('country', 'Belgium')->lists('city')); $this->assertEquals(['Bruges', 'Brussels', 'Ghent'], $user->addresses()->where('country', 'Belgium')->lists('city')->all());
$this->assertEquals(['Ghent', 'Brussels', 'Bruges'], $user->addresses()->where('country', 'Belgium')->orderBy('city', 'desc')->lists('city')); $this->assertEquals(['Ghent', 'Brussels', 'Bruges'], $user->addresses()->where('country', 'Belgium')->orderBy('city', 'desc')->lists('city')->all());
$results = $user->addresses->get(0); $results = $user->addresses->get(0);
$this->assertInstanceOf('Address', $results); $this->assertInstanceOf('Address', $results);
...@@ -495,10 +495,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -495,10 +495,10 @@ class EmbeddedRelationsTest extends TestCase {
$father = new User(['name' => 'Mark Doe']); $father = new User(['name' => 'Mark Doe']);
$father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.saving: '.get_class($father), $father)->andReturn(true); $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('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.created: ' . get_class($father), $father);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($father), $father); $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
$father = $user->father()->save($father); $father = $user->father()->save($father);
$father->unsetEventDispatcher(); $father->unsetEventDispatcher();
...@@ -514,10 +514,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -514,10 +514,10 @@ class EmbeddedRelationsTest extends TestCase {
$this->assertInstanceOf('MongoId', $raw['_id']); $this->assertInstanceOf('MongoId', $raw['_id']);
$father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.saving: '.get_class($father), $father)->andReturn(true); $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('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.updated: ' . get_class($father), $father);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($father), $father); $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
$father->name = 'Tom Doe'; $father->name = 'Tom Doe';
$user->father()->save($father); $user->father()->save($father);
...@@ -529,10 +529,10 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -529,10 +529,10 @@ class EmbeddedRelationsTest extends TestCase {
$father = new User(['name' => 'Jim Doe']); $father = new User(['name' => 'Jim Doe']);
$father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->once()->with('eloquent.saving: '.get_class($father), $father)->andReturn(true); $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('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.created: ' . get_class($father), $father);
$events->shouldReceive('fire')->once()->with('eloquent.saved: '.get_class($father), $father); $events->shouldReceive('fire')->once()->with('eloquent.saved: ' . get_class($father), $father);
$father = $user->father()->save($father); $father = $user->father()->save($father);
$father->unsetEventDispatcher(); $father->unsetEventDispatcher();
...@@ -547,7 +547,7 @@ class EmbeddedRelationsTest extends TestCase { ...@@ -547,7 +547,7 @@ class EmbeddedRelationsTest extends TestCase {
$father = new User(['name' => 'Mark Doe']); $father = new User(['name' => 'Mark Doe']);
$father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher')); $father->setEventDispatcher($events = Mockery::mock('Illuminate\Events\Dispatcher'));
$events->shouldReceive('until')->times(0)->with('eloquent.saving: '.get_class($father), $father); $events->shouldReceive('until')->times(0)->with('eloquent.saving: ' . get_class($father), $father);
$father = $user->father()->associate($father); $father = $user->father()->associate($father);
$father->unsetEventDispatcher(); $father->unsetEventDispatcher();
......
tests/ModelTest.php
View file @ bd26b77b
...@@ -231,7 +231,7 @@ class ModelTest extends TestCase { ...@@ -231,7 +231,7 @@ class ModelTest extends TestCase {
$this->assertEquals('Jane Poe', $user->name); $this->assertEquals('Jane Poe', $user->name);
$check = User::where('name', 'Jane Poe')->first(); $check = User::where('name', 'Jane Poe')->first();
$this->assertEquals($user, $check); $this->assertEquals($user->_id, $check->_id);
} }
public function testDestroy() public function testDestroy()
...@@ -380,8 +380,8 @@ class ModelTest extends TestCase { ...@@ -380,8 +380,8 @@ class ModelTest extends TestCase {
// test custom date format for json output // test custom date format for json output
$json = $user->toArray(); $json = $user->toArray();
$this->assertEquals((string) $user->birthday, $json['birthday']); $this->assertEquals($user->birthday->format('l jS \of F Y h:i:s A'), $json['birthday']);
$this->assertEquals((string) $user->created_at, $json['created_at']); $this->assertEquals($user->created_at->format('l jS \of F Y h:i:s A'), $json['created_at']);
// test default date format for json output // test default date format for json output
$item = Item::create(['name' => 'sword']); $item = Item::create(['name' => 'sword']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment