pull in changes

This commit is contained in:
Rob Gloudemans
2014-12-06 15:15:56 +01:00
parent 909d54baa6
commit 1f004b696a
3 changed files with 26 additions and 4 deletions

3
.gitignore vendored
View File

@@ -1,4 +1,5 @@
/vendor
composer.phar
composer.lock
.DS_Store
.DS_Store
.idea

View File

@@ -14,7 +14,8 @@
"illuminate/support": "~4"
},
"require-dev": {
"mockery/mockery": "0.9.*"
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.0"
},
"autoload": {
"psr-0": {

View File

@@ -18,7 +18,7 @@ class CartTest extends PHPUnit_Framework_TestCase {
public function setUp()
{
$session= new SessionMock;
$this->events = m::mock('Illuminate\Events\Dispatcher');
$this->events = m::mock('Illuminate\Contracts\Events\Dispatcher');
$this->cart = new Cart($session, $this->events);
}
@@ -36,6 +36,14 @@ class CartTest extends PHPUnit_Framework_TestCase {
$this->cart->add('293ad', 'Product 1', 1, 9.99, array('size' => 'large'));
}
public function testCartCanAddWithNumericId()
{
$this->events->shouldReceive('fire')->once()->with('cart.add', m::type('array'));
$this->events->shouldReceive('fire')->once()->with('cart.added', m::type('array'));
$this->cart->add(12345, 'Product 1', 1, 9.99, array('size' => 'large'));
}
public function testCartCanAddArray()
{
$this->events->shouldReceive('fire')->once()->with('cart.add', m::type('array'));
@@ -136,6 +144,19 @@ class CartTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('Product 2', $this->cart->content()->first()->name);
}
public function testCartCanUpdateItemToNumericId()
{
$this->events->shouldReceive('fire')->once()->with('cart.add', m::type('array'));
$this->events->shouldReceive('fire')->once()->with('cart.added', m::type('array'));
$this->events->shouldReceive('fire')->once()->with('cart.update', m::type('string'));
$this->events->shouldReceive('fire')->once()->with('cart.updated', m::type('string'));
$this->cart->add('293ad', 'Product 1', 1, 9.99);
$this->cart->update('8cbf215baa3b757e910e5305ab981172', array('id' => 12345));
$this->assertEquals(12345, $this->cart->content()->first()->id);
}
public function testCartCanUpdateOptions()
{
$this->events->shouldReceive('fire')->once()->with('cart.add', m::type('array'));
@@ -388,4 +409,3 @@ class CartTest extends PHPUnit_Framework_TestCase {
}
}