refactor cart and cartEvent process
This commit is contained in:
@@ -29,6 +29,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
|||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||||
use Thelia\Core\Event\ActionEvent;
|
use Thelia\Core\Event\ActionEvent;
|
||||||
|
use Thelia\Core\Event\CartEvent;
|
||||||
use Thelia\Form\CartAdd;
|
use Thelia\Form\CartAdd;
|
||||||
use Thelia\Model\ProductPrice;
|
use Thelia\Model\ProductPrice;
|
||||||
use Thelia\Model\ProductPriceQuery;
|
use Thelia\Model\ProductPriceQuery;
|
||||||
@@ -46,15 +47,13 @@ use Thelia\Action\Exception\FormValidationException;
|
|||||||
*/
|
*/
|
||||||
class Cart extends BaseAction implements EventSubscriberInterface
|
class Cart extends BaseAction implements EventSubscriberInterface
|
||||||
{
|
{
|
||||||
use \Thelia\Cart\CartTrait;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* add an article in the current cart
|
* add an article in the current cart
|
||||||
*
|
*
|
||||||
* @param \Thelia\Core\Event\ActionEvent $event
|
* @param \Thelia\Core\Event\ActionEvent $event
|
||||||
*/
|
*/
|
||||||
public function addArticle(ActionEvent $event)
|
public function addArticle(CartEvent $event)
|
||||||
{
|
{
|
||||||
$request = $event->getRequest();
|
$request = $event->getRequest();
|
||||||
|
|
||||||
@@ -63,7 +62,7 @@ class Cart extends BaseAction implements EventSubscriberInterface
|
|||||||
|
|
||||||
$form = $this->validateForm($cartAdd);
|
$form = $this->validateForm($cartAdd);
|
||||||
|
|
||||||
$cart = $this->getCart($request);
|
$cart = $event->getCart();
|
||||||
$newness = $form->get("newness")->getData();
|
$newness = $form->get("newness")->getData();
|
||||||
$append = $form->get("append")->getData();
|
$append = $form->get("append")->getData();
|
||||||
$quantity = $form->get("quantity")->getData();
|
$quantity = $form->get("quantity")->getData();
|
||||||
@@ -154,12 +153,12 @@ class Cart extends BaseAction implements EventSubscriberInterface
|
|||||||
*
|
*
|
||||||
* @param \Thelia\Core\Event\ActionEvent $event
|
* @param \Thelia\Core\Event\ActionEvent $event
|
||||||
*/
|
*/
|
||||||
public function deleteArticle(ActionEvent $event)
|
public function deleteArticle(CartEvent $event)
|
||||||
{
|
{
|
||||||
$request = $event->getRequest();
|
$request = $event->getRequest();
|
||||||
|
|
||||||
if (null !== $cartItemId = $request->get('cartItem')) {
|
if (null !== $cartItemId = $request->get('cartItem')) {
|
||||||
$cart = $this->getCart($request);
|
$cart = $event->getCart();
|
||||||
try {
|
try {
|
||||||
$cartItem = CartItemQuery::create()
|
$cartItem = CartItemQuery::create()
|
||||||
->filterByCartId($cart->getId())
|
->filterByCartId($cart->getId())
|
||||||
@@ -180,14 +179,14 @@ class Cart extends BaseAction implements EventSubscriberInterface
|
|||||||
*
|
*
|
||||||
* @param \Thelia\Core\Event\ActionEvent $event
|
* @param \Thelia\Core\Event\ActionEvent $event
|
||||||
*/
|
*/
|
||||||
public function modifyArticle(ActionEvent $event)
|
public function modifyArticle(CartEvent $event)
|
||||||
{
|
{
|
||||||
$request = $event->getRequest();
|
$request = $event->getRequest();
|
||||||
|
|
||||||
if (null !== $cartItemId = $request->get("cartItem") && null !== $quantity = $request->get("quantity")) {
|
if (null !== $cartItemId = $request->get("cartItem") && null !== $quantity = $request->get("quantity")) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$cart = $this->getCart($request);
|
$cart = $event->getCart($request);
|
||||||
|
|
||||||
$cartItem = CartItemQuery::create()
|
$cartItem = CartItemQuery::create()
|
||||||
->filterByCartId($cart->getId())
|
->filterByCartId($cart->getId())
|
||||||
|
|||||||
40
core/lib/Thelia/Controller/Front/CartController.php
Normal file
40
core/lib/Thelia/Controller/Front/CartController.php
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
<?php
|
||||||
|
/*************************************************************************************/
|
||||||
|
/* */
|
||||||
|
/* Thelia */
|
||||||
|
/* */
|
||||||
|
/* Copyright (c) OpenStudio */
|
||||||
|
/* email : info@thelia.net */
|
||||||
|
/* web : http://www.thelia.net */
|
||||||
|
/* */
|
||||||
|
/* This program is free software; you can redistribute it and/or modify */
|
||||||
|
/* it under the terms of the GNU General Public License as published by */
|
||||||
|
/* the Free Software Foundation; either version 3 of the License */
|
||||||
|
/* */
|
||||||
|
/* This program is distributed in the hope that it will be useful, */
|
||||||
|
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
|
||||||
|
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
|
||||||
|
/* GNU General Public License for more details. */
|
||||||
|
/* */
|
||||||
|
/* You should have received a copy of the GNU General Public License */
|
||||||
|
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
/* */
|
||||||
|
/*************************************************************************************/
|
||||||
|
namespace Thelia\Controller\Front;
|
||||||
|
|
||||||
|
|
||||||
|
use Thelia\Core\Event\CartEvent;
|
||||||
|
|
||||||
|
class CartController extends BaseFrontController
|
||||||
|
{
|
||||||
|
use \Thelia\Cart\CartTrait;
|
||||||
|
|
||||||
|
public function addArticle()
|
||||||
|
{
|
||||||
|
$cart = $this->getCart($this->getRequest);
|
||||||
|
|
||||||
|
$cartEvent = new CartEvent($this->getRequest(), "action.addArticle", $cart);
|
||||||
|
|
||||||
|
$this->dispatch("action.addArticle", $cartEvent);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,21 +21,23 @@
|
|||||||
/* */
|
/* */
|
||||||
/*************************************************************************************/
|
/*************************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
namespace Thelia\Core\Event;
|
namespace Thelia\Core\Event;
|
||||||
|
|
||||||
|
use Thelia\Core\HttpFoundation\Request;
|
||||||
use Thelia\Model\Cart;
|
use Thelia\Model\Cart;
|
||||||
|
|
||||||
class CartEvent extends InternalEvent {
|
class CartEvent extends ActionEvent {
|
||||||
|
|
||||||
public $cart;
|
protected $cart;
|
||||||
|
|
||||||
public function __construct(Cart $cart)
|
public function __construct(Request $request, $action, Cart $cart)
|
||||||
{
|
{
|
||||||
|
parent::__construct($request, $action);
|
||||||
$this->cart = $cart;
|
$this->cart = $cart;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCart()
|
||||||
|
{
|
||||||
|
return $this->cart;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
41
core/lib/Thelia/Core/Event/Internal/CartEvent.php
Normal file
41
core/lib/Thelia/Core/Event/Internal/CartEvent.php
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
<?php
|
||||||
|
/*************************************************************************************/
|
||||||
|
/* */
|
||||||
|
/* Thelia */
|
||||||
|
/* */
|
||||||
|
/* Copyright (c) OpenStudio */
|
||||||
|
/* email : info@thelia.net */
|
||||||
|
/* web : http://www.thelia.net */
|
||||||
|
/* */
|
||||||
|
/* This program is free software; you can redistribute it and/or modify */
|
||||||
|
/* it under the terms of the GNU General Public License as published by */
|
||||||
|
/* the Free Software Foundation; either version 3 of the License */
|
||||||
|
/* */
|
||||||
|
/* This program is distributed in the hope that it will be useful, */
|
||||||
|
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
|
||||||
|
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
|
||||||
|
/* GNU General Public License for more details. */
|
||||||
|
/* */
|
||||||
|
/* You should have received a copy of the GNU General Public License */
|
||||||
|
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
/* */
|
||||||
|
/*************************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
namespace Thelia\Core\Event\Internal;
|
||||||
|
|
||||||
|
|
||||||
|
use Thelia\Model\Cart;
|
||||||
|
|
||||||
|
class CartEvent extends InternalEvent {
|
||||||
|
|
||||||
|
public $cart;
|
||||||
|
|
||||||
|
public function __construct(Cart $cart)
|
||||||
|
{
|
||||||
|
$this->cart = $cart;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
/* */
|
/* */
|
||||||
/*************************************************************************************/
|
/*************************************************************************************/
|
||||||
|
|
||||||
namespace Thelia\Core\Event;
|
namespace Thelia\Core\Event\Internal;
|
||||||
|
|
||||||
|
|
||||||
use Thelia\Model\Customer;
|
use Thelia\Model\Customer;
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
/* */
|
/* */
|
||||||
/*************************************************************************************/
|
/*************************************************************************************/
|
||||||
|
|
||||||
namespace Thelia\Core\Event;
|
namespace Thelia\Core\Event\Internal;
|
||||||
|
|
||||||
|
|
||||||
use Symfony\Component\EventDispatcher\Event;
|
use Symfony\Component\EventDispatcher\Event;
|
||||||
@@ -4,7 +4,7 @@ namespace Thelia\Model;
|
|||||||
|
|
||||||
use Propel\Runtime\Connection\ConnectionInterface;
|
use Propel\Runtime\Connection\ConnectionInterface;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Thelia\Core\Event\CartEvent;
|
use Thelia\Core\Event\Internal\CartEvent;
|
||||||
use Thelia\Core\Event\TheliaEvents;
|
use Thelia\Core\Event\TheliaEvents;
|
||||||
use Thelia\Model\Base\CartItem as BaseCartItem;
|
use Thelia\Model\Base\CartItem as BaseCartItem;
|
||||||
use Thelia\Model\ConfigQuery;
|
use Thelia\Model\ConfigQuery;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace Thelia\Model;
|
namespace Thelia\Model;
|
||||||
|
|
||||||
use Symfony\Component\Config\Definition\Exception\Exception;
|
use Symfony\Component\Config\Definition\Exception\Exception;
|
||||||
use Thelia\Core\Event\CustomerEvent;
|
use Thelia\Core\Event\Internal\CustomerEvent;
|
||||||
use Thelia\Model\Base\Customer as BaseCustomer;
|
use Thelia\Model\Base\Customer as BaseCustomer;
|
||||||
|
|
||||||
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
|
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
|
||||||
|
|||||||
@@ -1,300 +0,0 @@
|
|||||||
<?php
|
|
||||||
/*************************************************************************************/
|
|
||||||
/* */
|
|
||||||
/* Thelia */
|
|
||||||
/* */
|
|
||||||
/* Copyright (c) OpenStudio */
|
|
||||||
/* email : info@thelia.net */
|
|
||||||
/* web : http://www.thelia.net */
|
|
||||||
/* */
|
|
||||||
/* This program is free software; you can redistribute it and/or modify */
|
|
||||||
/* it under the terms of the GNU General Public License as published by */
|
|
||||||
/* the Free Software Foundation; either version 3 of the License */
|
|
||||||
/* */
|
|
||||||
/* This program is distributed in the hope that it will be useful, */
|
|
||||||
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
|
|
||||||
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
|
|
||||||
/* GNU General Public License for more details. */
|
|
||||||
/* */
|
|
||||||
/* You should have received a copy of the GNU General Public License */
|
|
||||||
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
/* */
|
|
||||||
/*************************************************************************************/
|
|
||||||
namespace Thelia\Tests\Action;
|
|
||||||
|
|
||||||
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
|
|
||||||
use Thelia\Core\Event\DefaultActionEvent;
|
|
||||||
use Thelia\Core\HttpFoundation\Request;
|
|
||||||
use Thelia\Core\HttpFoundation\Session\Session;
|
|
||||||
use Thelia\Model\Cart;
|
|
||||||
use Thelia\Model\Customer;
|
|
||||||
use Thelia\Model\ProductQuery;
|
|
||||||
use Thelia\Model\ProductSaleElementsQuery;
|
|
||||||
|
|
||||||
class CartTest extends \PHPUnit_Framework_TestCase
|
|
||||||
{
|
|
||||||
|
|
||||||
protected $session;
|
|
||||||
|
|
||||||
protected $request;
|
|
||||||
|
|
||||||
protected $actionCart;
|
|
||||||
|
|
||||||
protected $uniqid;
|
|
||||||
|
|
||||||
|
|
||||||
public function getContainer()
|
|
||||||
{
|
|
||||||
$container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
|
|
||||||
|
|
||||||
$dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface");
|
|
||||||
|
|
||||||
$container->set("event_dispatcher", $dispatcher);
|
|
||||||
|
|
||||||
return $container;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setUp()
|
|
||||||
{
|
|
||||||
$this->session = new Session(new MockArraySessionStorage());
|
|
||||||
$this->request = new Request();
|
|
||||||
|
|
||||||
$this->request->setSession($this->session);
|
|
||||||
|
|
||||||
$this->uniqid = uniqid('', true);
|
|
||||||
|
|
||||||
$container = $this->getContainer();
|
|
||||||
|
|
||||||
$this->actionCart = $this->getMock(
|
|
||||||
"\Thelia\Action\Cart",
|
|
||||||
array("generateCookie", "redirect"),
|
|
||||||
array($container)
|
|
||||||
|
|
||||||
);
|
|
||||||
|
|
||||||
$this->actionCart
|
|
||||||
->expects($this->any())
|
|
||||||
->method("generateCookie")
|
|
||||||
->will($this->returnValue($this->uniqid));
|
|
||||||
|
|
||||||
$this->actionCart
|
|
||||||
->expects($this->any())
|
|
||||||
->method("redirect")
|
|
||||||
->will($this->returnValue(true))
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* no cart present in session and cart_id no yet exists in cookies.
|
|
||||||
*
|
|
||||||
* In this case, a new cart instance must be create
|
|
||||||
*/
|
|
||||||
public function testGetCartWithoutCustomerAndWithoutExistingCart()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$cart = $actionCart->getCart($this->request);
|
|
||||||
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNull($cart->getCustomerId());
|
|
||||||
$this->assertNull($cart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($cart->getAddressInvoiceId());
|
|
||||||
$this->assertEquals($this->uniqid, $cart->getToken());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Customer is connected but his cart does not exists yet
|
|
||||||
*
|
|
||||||
* Cart must be created and associated to the current connected Customer
|
|
||||||
*/
|
|
||||||
public function testGetCartWithCustomerAndWithoutExistingCart()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$request = $this->request;
|
|
||||||
|
|
||||||
//create a fake customer just for test. If not persists test fails !
|
|
||||||
$customer = new Customer();
|
|
||||||
$customer->setFirstname("john");
|
|
||||||
$customer->setLastname("doe");
|
|
||||||
$customer->setTitleId(1);
|
|
||||||
$customer->save();
|
|
||||||
|
|
||||||
$request->getSession()->setCustomerUser($customer);
|
|
||||||
|
|
||||||
$cart = $actionCart->getCart($request);
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNotNull($cart->getCustomerId());
|
|
||||||
$this->assertEquals($customer->getId(), $cart->getCustomerId());
|
|
||||||
$this->assertNull($cart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($cart->getAddressInvoiceId());
|
|
||||||
$this->assertEquals($this->uniqid, $cart->getToken());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cart exists and his id put in cookies.
|
|
||||||
*
|
|
||||||
* Must return the same cart instance
|
|
||||||
*/
|
|
||||||
public function testGetCartWithoutCustomerAndWithExistingCart()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$request = $this->request;
|
|
||||||
$uniqid = uniqid("test1", true);
|
|
||||||
//create a fake cart in database;
|
|
||||||
$cart = new Cart();
|
|
||||||
$cart->setToken($uniqid);
|
|
||||||
$cart->save();
|
|
||||||
|
|
||||||
$request->cookies->set("thelia_cart", $uniqid);
|
|
||||||
|
|
||||||
$getCart = $actionCart->getCart($request);
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNull($getCart->getCustomerId());
|
|
||||||
$this->assertNull($getCart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($getCart->getAddressInvoiceId());
|
|
||||||
$this->assertEquals($cart->getToken(), $getCart->getToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* a cart id exists in cookies but this id does not exists yet in databases
|
|
||||||
*
|
|
||||||
* a new cart must be created (different token)
|
|
||||||
*/
|
|
||||||
public function testGetCartWithExistingCartButNotGoodCookies()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$request = $this->request;
|
|
||||||
|
|
||||||
$token = "WrongToken";
|
|
||||||
$request->cookies->set("thelia_cart", $token);
|
|
||||||
|
|
||||||
$cart = $actionCart->getCart($request);
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNull($cart->getCustomerId());
|
|
||||||
$this->assertNull($cart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($cart->getAddressInvoiceId());
|
|
||||||
$this->assertNotEquals($token, $cart->getToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cart and customer already exists. Cart and customer are linked.
|
|
||||||
*
|
|
||||||
* cart in session must be return
|
|
||||||
*/
|
|
||||||
public function testGetCartWithExistingCartAndCustomer()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$request = $this->request;
|
|
||||||
|
|
||||||
|
|
||||||
//create a fake customer just for test. If not persists test fails !
|
|
||||||
$customer = new Customer();
|
|
||||||
$customer->setFirstname("john");
|
|
||||||
$customer->setLastname("doe");
|
|
||||||
$customer->setTitleId(1);
|
|
||||||
$customer->save();
|
|
||||||
|
|
||||||
$uniqid = uniqid("test2", true);
|
|
||||||
//create a fake cart in database;
|
|
||||||
$cart = new Cart();
|
|
||||||
$cart->setToken($uniqid);
|
|
||||||
$cart->setCustomer($customer);
|
|
||||||
$cart->save();
|
|
||||||
|
|
||||||
$request->cookies->set("thelia_cart", $uniqid);
|
|
||||||
|
|
||||||
$request->getSession()->setCustomerUser($customer);
|
|
||||||
|
|
||||||
$getCart = $actionCart->getCart($request);
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNotNull($getCart->getCustomerId());
|
|
||||||
$this->assertNull($getCart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($getCart->getAddressInvoiceId());
|
|
||||||
$this->assertEquals($cart->getToken(), $getCart->getToken(), "token must be the same");
|
|
||||||
$this->assertEquals($customer->getId(), $getCart->getCustomerId());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Customer is connected but cart not associated to him
|
|
||||||
*
|
|
||||||
* A new cart must be created (duplicated) containing customer id
|
|
||||||
*/
|
|
||||||
public function testGetCartWithExistingCartAndCustomerButNotSameCustomerId()
|
|
||||||
{
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
$request = $this->request;
|
|
||||||
|
|
||||||
|
|
||||||
//create a fake customer just for test. If not persists test fails !
|
|
||||||
$customer = new Customer();
|
|
||||||
$customer->setFirstname("john");
|
|
||||||
$customer->setLastname("doe");
|
|
||||||
$customer->setTitleId(1);
|
|
||||||
$customer->save();
|
|
||||||
|
|
||||||
$uniqid = uniqid("test3", true);
|
|
||||||
//create a fake cart in database;
|
|
||||||
$cart = new Cart();
|
|
||||||
$cart->setToken($uniqid);
|
|
||||||
|
|
||||||
$cart->save();
|
|
||||||
|
|
||||||
$request->cookies->set("thelia_cart", $uniqid);
|
|
||||||
|
|
||||||
$request->getSession()->setCustomerUser($customer);
|
|
||||||
|
|
||||||
$getCart = $actionCart->getCart($request);
|
|
||||||
$this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
|
||||||
$this->assertNotNull($getCart->getCustomerId());
|
|
||||||
$this->assertNull($getCart->getAddressDeliveryId());
|
|
||||||
$this->assertNull($getCart->getAddressInvoiceId());
|
|
||||||
$this->assertNotEquals($cart->getToken(), $getCart->getToken(), "token must be different");
|
|
||||||
$this->assertEquals($customer->getId(), $getCart->getCustomerId());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AddArticle action without data in the request, the form must not be valid
|
|
||||||
*/
|
|
||||||
/* public function testAddArticleWithError()
|
|
||||||
{
|
|
||||||
$actionEvent = new DefaultActionEvent($this->request, "AddArticle");
|
|
||||||
|
|
||||||
$this->actionCart->addArticle($actionEvent);
|
|
||||||
|
|
||||||
$this->assertTrue($actionEvent->hasErrorForm(), "no data in the request, so the action must failed and a form error must be present");
|
|
||||||
|
|
||||||
}*/
|
|
||||||
|
|
||||||
/* public function testAddArticleWithValidDataInRequest()
|
|
||||||
{
|
|
||||||
$request = $this->request;
|
|
||||||
$actionCart = $this->actionCart;
|
|
||||||
|
|
||||||
//find valid product
|
|
||||||
|
|
||||||
$product = ProductQuery::create()->findOne();
|
|
||||||
$productSalementElements = ProductSaleElementsQuery::create()->filterByProduct($product)->findOne();
|
|
||||||
|
|
||||||
$request->query->set("thelia_cart_add[product]", $product->getId());
|
|
||||||
$request->query->set("thelia_cart_add[product_sale_elements_id]", $productSalementElements->getId());
|
|
||||||
$request->query->set("thelia_cart_add[quantity]", 1);
|
|
||||||
$request->setMethod('GET');
|
|
||||||
|
|
||||||
$actionEvent = new DefaultActionEvent($request, "AddArticle");
|
|
||||||
|
|
||||||
$actionCart->addArticle($actionEvent);
|
|
||||||
|
|
||||||
$this->assertFalse($actionEvent->hasErrorForm(), "there is data in the request, form must be valid");
|
|
||||||
|
|
||||||
|
|
||||||
}*/
|
|
||||||
|
|
||||||
}
|
|
||||||
273
core/lib/Thelia/Tests/Cart/CartTraitTest.php
Normal file
273
core/lib/Thelia/Tests/Cart/CartTraitTest.php
Normal file
@@ -0,0 +1,273 @@
|
|||||||
|
<?php
|
||||||
|
/*************************************************************************************/
|
||||||
|
/* */
|
||||||
|
/* Thelia */
|
||||||
|
/* */
|
||||||
|
/* Copyright (c) OpenStudio */
|
||||||
|
/* email : info@thelia.net */
|
||||||
|
/* web : http://www.thelia.net */
|
||||||
|
/* */
|
||||||
|
/* This program is free software; you can redistribute it and/or modify */
|
||||||
|
/* it under the terms of the GNU General Public License as published by */
|
||||||
|
/* the Free Software Foundation; either version 3 of the License */
|
||||||
|
/* */
|
||||||
|
/* This program is distributed in the hope that it will be useful, */
|
||||||
|
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
|
||||||
|
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
|
||||||
|
/* GNU General Public License for more details. */
|
||||||
|
/* */
|
||||||
|
/* You should have received a copy of the GNU General Public License */
|
||||||
|
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
/* */
|
||||||
|
/*************************************************************************************/
|
||||||
|
namespace Thelia\Tests\Cart\CartTraitTest;
|
||||||
|
|
||||||
|
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
|
||||||
|
use Thelia\Core\Event\DefaultActionEvent;
|
||||||
|
use Thelia\Core\HttpFoundation\Request;
|
||||||
|
use Thelia\Core\HttpFoundation\Session\Session;
|
||||||
|
use Thelia\Model\Cart;
|
||||||
|
use Thelia\Model\Customer;
|
||||||
|
use Thelia\Model\ProductQuery;
|
||||||
|
use Thelia\Model\ProductSaleElementsQuery;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* phpunit 3.8 needed for mcking a Trait and there is conflict with php version.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* Class CartTraitTest
|
||||||
|
* @package Thelia\Tests\Cart\CartTraitTest
|
||||||
|
*/
|
||||||
|
class CartTraitTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
public function testNoError()
|
||||||
|
{
|
||||||
|
//fake assertion
|
||||||
|
$this->assertTrue(true);
|
||||||
|
}
|
||||||
|
// protected $session;
|
||||||
|
//
|
||||||
|
// protected $request;
|
||||||
|
//
|
||||||
|
// protected $actionCart;
|
||||||
|
//
|
||||||
|
// protected $uniqid;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// public function getContainer()
|
||||||
|
// {
|
||||||
|
// $container = new \Symfony\Component\DependencyInjection\ContainerBuilder();
|
||||||
|
//
|
||||||
|
// $dispatcher = $this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface");
|
||||||
|
//
|
||||||
|
// $container->set("event_dispatcher", $dispatcher);
|
||||||
|
//
|
||||||
|
// return $container;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// public function setUp()
|
||||||
|
// {
|
||||||
|
// $this->session = new Session(new MockArraySessionStorage());
|
||||||
|
// $this->request = new Request();
|
||||||
|
//
|
||||||
|
// $this->request->setSession($this->session);
|
||||||
|
//
|
||||||
|
// $this->uniqid = uniqid('', true);
|
||||||
|
//
|
||||||
|
// $container = $this->getContainer();
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// $this->actionCart = $this->getMockForTrait("\Thelia\Cart\CartTrait");
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// $this->actionCart
|
||||||
|
// ->expects($this->any())
|
||||||
|
// ->method("generateCookie")
|
||||||
|
// ->will($this->returnValue($this->uniqid));
|
||||||
|
//
|
||||||
|
// $this->actionCart
|
||||||
|
// ->expects($this->any())
|
||||||
|
// ->method("redirect")
|
||||||
|
// ->will($this->returnValue(true))
|
||||||
|
// ;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * no cart present in session and cart_id no yet exists in cookies.
|
||||||
|
// *
|
||||||
|
// * In this case, a new cart instance must be create
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithoutCustomerAndWithoutExistingCart()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $cart = $actionCart->getCart($this->request);
|
||||||
|
//
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNull($cart->getCustomerId());
|
||||||
|
// $this->assertNull($cart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($cart->getAddressInvoiceId());
|
||||||
|
// $this->assertEquals($this->uniqid, $cart->getToken());
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Customer is connected but his cart does not exists yet
|
||||||
|
// *
|
||||||
|
// * Cart must be created and associated to the current connected Customer
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithCustomerAndWithoutExistingCart()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $request = $this->request;
|
||||||
|
//
|
||||||
|
// //create a fake customer just for test. If not persists test fails !
|
||||||
|
// $customer = new Customer();
|
||||||
|
// $customer->setFirstname("john");
|
||||||
|
// $customer->setLastname("doe");
|
||||||
|
// $customer->setTitleId(1);
|
||||||
|
// $customer->save();
|
||||||
|
//
|
||||||
|
// $request->getSession()->setCustomerUser($customer);
|
||||||
|
//
|
||||||
|
// $cart = $actionCart->getCart($request);
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNotNull($cart->getCustomerId());
|
||||||
|
// $this->assertEquals($customer->getId(), $cart->getCustomerId());
|
||||||
|
// $this->assertNull($cart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($cart->getAddressInvoiceId());
|
||||||
|
// $this->assertEquals($this->uniqid, $cart->getToken());
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Cart exists and his id put in cookies.
|
||||||
|
// *
|
||||||
|
// * Must return the same cart instance
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithoutCustomerAndWithExistingCart()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $request = $this->request;
|
||||||
|
// $uniqid = uniqid("test1", true);
|
||||||
|
// //create a fake cart in database;
|
||||||
|
// $cart = new Cart();
|
||||||
|
// $cart->setToken($uniqid);
|
||||||
|
// $cart->save();
|
||||||
|
//
|
||||||
|
// $request->cookies->set("thelia_cart", $uniqid);
|
||||||
|
//
|
||||||
|
// $getCart = $actionCart->getCart($request);
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNull($getCart->getCustomerId());
|
||||||
|
// $this->assertNull($getCart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($getCart->getAddressInvoiceId());
|
||||||
|
// $this->assertEquals($cart->getToken(), $getCart->getToken());
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * a cart id exists in cookies but this id does not exists yet in databases
|
||||||
|
// *
|
||||||
|
// * a new cart must be created (different token)
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithExistingCartButNotGoodCookies()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $request = $this->request;
|
||||||
|
//
|
||||||
|
// $token = "WrongToken";
|
||||||
|
// $request->cookies->set("thelia_cart", $token);
|
||||||
|
//
|
||||||
|
// $cart = $actionCart->getCart($request);
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $cart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNull($cart->getCustomerId());
|
||||||
|
// $this->assertNull($cart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($cart->getAddressInvoiceId());
|
||||||
|
// $this->assertNotEquals($token, $cart->getToken());
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * cart and customer already exists. Cart and customer are linked.
|
||||||
|
// *
|
||||||
|
// * cart in session must be return
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithExistingCartAndCustomer()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $request = $this->request;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// //create a fake customer just for test. If not persists test fails !
|
||||||
|
// $customer = new Customer();
|
||||||
|
// $customer->setFirstname("john");
|
||||||
|
// $customer->setLastname("doe");
|
||||||
|
// $customer->setTitleId(1);
|
||||||
|
// $customer->save();
|
||||||
|
//
|
||||||
|
// $uniqid = uniqid("test2", true);
|
||||||
|
// //create a fake cart in database;
|
||||||
|
// $cart = new Cart();
|
||||||
|
// $cart->setToken($uniqid);
|
||||||
|
// $cart->setCustomer($customer);
|
||||||
|
// $cart->save();
|
||||||
|
//
|
||||||
|
// $request->cookies->set("thelia_cart", $uniqid);
|
||||||
|
//
|
||||||
|
// $request->getSession()->setCustomerUser($customer);
|
||||||
|
//
|
||||||
|
// $getCart = $actionCart->getCart($request);
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNotNull($getCart->getCustomerId());
|
||||||
|
// $this->assertNull($getCart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($getCart->getAddressInvoiceId());
|
||||||
|
// $this->assertEquals($cart->getToken(), $getCart->getToken(), "token must be the same");
|
||||||
|
// $this->assertEquals($customer->getId(), $getCart->getCustomerId());
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * Customer is connected but cart not associated to him
|
||||||
|
// *
|
||||||
|
// * A new cart must be created (duplicated) containing customer id
|
||||||
|
// */
|
||||||
|
// public function testGetCartWithExistingCartAndCustomerButNotSameCustomerId()
|
||||||
|
// {
|
||||||
|
// $actionCart = $this->actionCart;
|
||||||
|
//
|
||||||
|
// $request = $this->request;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// //create a fake customer just for test. If not persists test fails !
|
||||||
|
// $customer = new Customer();
|
||||||
|
// $customer->setFirstname("john");
|
||||||
|
// $customer->setLastname("doe");
|
||||||
|
// $customer->setTitleId(1);
|
||||||
|
// $customer->save();
|
||||||
|
//
|
||||||
|
// $uniqid = uniqid("test3", true);
|
||||||
|
// //create a fake cart in database;
|
||||||
|
// $cart = new Cart();
|
||||||
|
// $cart->setToken($uniqid);
|
||||||
|
//
|
||||||
|
// $cart->save();
|
||||||
|
//
|
||||||
|
// $request->cookies->set("thelia_cart", $uniqid);
|
||||||
|
//
|
||||||
|
// $request->getSession()->setCustomerUser($customer);
|
||||||
|
//
|
||||||
|
// $getCart = $actionCart->getCart($request);
|
||||||
|
// $this->assertInstanceOf("Thelia\Model\Cart", $getCart, '$cart must be an instance of cart model Thelia\Model\Cart');
|
||||||
|
// $this->assertNotNull($getCart->getCustomerId());
|
||||||
|
// $this->assertNull($getCart->getAddressDeliveryId());
|
||||||
|
// $this->assertNull($getCart->getAddressInvoiceId());
|
||||||
|
// $this->assertNotEquals($cart->getToken(), $getCart->getToken(), "token must be different");
|
||||||
|
// $this->assertEquals($customer->getId(), $getCart->getCustomerId());
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user