Skip to content

erp5
erp5
Commit c9ea2b02 authored by Lucas Carvalho's avatar Lucas Carvalho
Browse files
Options

Improved code style. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30311 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 28728aaa
Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 179 deletions
product/ERP5/tests/testERP5Commerce.py
View file @ c9ea2b02
...@@ -58,10 +58,12 @@ if parameter_dict['METHOD'] == 'DoExpressCheckoutPayment': ...@@ -58,10 +58,12 @@ if parameter_dict['METHOD'] == 'DoExpressCheckoutPayment':
return {'ACK':'Failure'} return {'ACK':'Failure'}
""" """
class TestCommerce(ERP5TypeTestCase): class TestCommerce(ERP5TypeTestCase):
""" """
Todo : Todo:
> Change name of all script, they are most of them never called on a SaleOrder > Change name of all script, most of them should not be called on a
SaleOrder.
> Test SaleOrder_getShoppingCartItemList With include_shipping=True > Test SaleOrder_getShoppingCartItemList With include_shipping=True
> implement Person_getApplicableDiscountList (actually just return None) > implement Person_getApplicableDiscountList (actually just return None)
> implement Person_getApplicableTaxList (actually always return a tax of 20%) > implement Person_getApplicableTaxList (actually always return a tax of 20%)
...@@ -104,7 +106,6 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -104,7 +106,6 @@ class TestCommerce(ERP5TypeTestCase):
'erp5_pdm', 'erp5_pdm',
'erp5_commerce',) 'erp5_commerce',)
def afterSetUp(self): def afterSetUp(self):
uf = self.getPortal().acl_users uf = self.getPortal().acl_users
uf._doAddUser('ivan', '', ['Manager'], []) uf._doAddUser('ivan', '', ['Manager'], [])
...@@ -160,8 +161,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -160,8 +161,8 @@ class TestCommerce(ERP5TypeTestCase):
if default_order_rule.getValidationState() != 'validated': if default_order_rule.getValidationState() != 'validated':
self.portal.portal_rules.default_order_rule.validate() self.portal.portal_rules.default_order_rule.validate()
self.web_site = self.setupWebSite() self.website = self.setupWebSite()
self.web_site.setProperty('ecommerce_base_currency', self.website.setProperty('ecommerce_base_currency',
currency.getRelativeUrl()) currency.getRelativeUrl())
self.app.REQUEST.set('session_id', SESSION_ID) self.app.REQUEST.set('session_id', SESSION_ID)
...@@ -211,7 +212,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -211,7 +212,8 @@ class TestCommerce(ERP5TypeTestCase):
# Set the assignment # Set the assignment
assignment = person.newContent(portal_type='Assignment') assignment = person.newContent(portal_type='Assignment')
assignment.edit(function='', destination_value= getattr(self, 'seller', None), assignment.edit(function='',
destination_value=getattr(self, 'seller', None),
start_date='1972-01-01', stop_date='2999-12-31', start_date='1972-01-01', stop_date='2999-12-31',
group=group, destination_project=destination_project) group=group, destination_project=destination_project)
assignment.open() assignment.open()
...@@ -219,7 +221,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -219,7 +221,8 @@ class TestCommerce(ERP5TypeTestCase):
self.tic() self.tic()
#XXX: Security hack (lucas) #XXX: Security hack (lucas)
self.portal.acl_users.zodb_roles.assignRoleToPrincipal('Manager', reference) self.portal.acl_users.zodb_roles.assignRoleToPrincipal('Manager',
reference)
def getDefaultProduct(self, id='1'): def getDefaultProduct(self, id='1'):
""" """
...@@ -306,15 +309,15 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -306,15 +309,15 @@ class TestCommerce(ERP5TypeTestCase):
localizer.manage_addLanguage(language=language) localizer.manage_addLanguage(language=language)
# create website # create website
web_site = getattr(self.portal.web_site_module, 'web_site', None) website = getattr(self.portal.web_site_module, 'website', None)
if web_site is None: if website is None:
web_site = self.portal.web_site_module.newContent(portal_type='Web Site', website = self.portal.web_site_module.newContent(portal_type='Web Site',
id='web_site', id='website',
**kw) **kw)
transaction.commit() transaction.commit()
self.tic() self.tic()
web_site.WebSite_setupECommerceWebSite() website.WebSite_setupECommerceWebSite()
self.initialiseSupplyLine() self.initialiseSupplyLine()
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -325,7 +328,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -325,7 +328,7 @@ class TestCommerce(ERP5TypeTestCase):
reference='webmaster', reference='webmaster',
group=None) group=None)
return web_site return website
def createShoppingCartWithProductListAndShipping(self): def createShoppingCartWithProductListAndShipping(self):
""" """
...@@ -333,7 +336,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -333,7 +336,7 @@ class TestCommerce(ERP5TypeTestCase):
some Products and select one Shipping. some Products and select one Shipping.
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
self.web_site.Resource_addToShoppingCart(resource=default_product, self.website.Resource_addToShoppingCart(resource=default_product,
quantity=1) quantity=1)
shopping_cart = self.portal.SaleOrder_getShoppingCart() shopping_cart = self.portal.SaleOrder_getShoppingCart()
...@@ -355,20 +358,20 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -355,20 +358,20 @@ class TestCommerce(ERP5TypeTestCase):
# set 'session_id' to simulate browser (cookie) environment # set 'session_id' to simulate browser (cookie) environment
self.app.REQUEST.set('session_id', SESSION_ID) self.app.REQUEST.set('session_id', SESSION_ID)
self.assertEquals(SESSION_ID, self.web_site.SaleOrder_getShoppingCartId()) self.assertEquals(SESSION_ID, self.website.SaleOrder_getShoppingCartId())
# check if the shopping cart is empty # check if the shopping cart is empty
self.assertTrue(self.web_site.SaleOrder_isShoppingCartEmpty()) self.assertTrue(self.website.SaleOrder_isShoppingCartEmpty())
# add product to shopping cart # add product to shopping cart
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
shoppping_cart_item_list = self.web_site.SaleOrder_getShoppingCartItemList() shoppping_cart_item_list = self.website.SaleOrder_getShoppingCartItemList()
self.assertEquals(1, len(shoppping_cart_item_list)) self.assertEquals(1, len(shoppping_cart_item_list))
self.assertEquals(1, shoppping_cart_item_list[0].getQuantity()) self.assertEquals(1, shoppping_cart_item_list[0].getQuantity())
self.assertEquals(shoppping_cart_item_list[0].getResource(), \ self.assertEquals(shoppping_cart_item_list[0].getResource(), \
default_product.getRelativeUrl()) default_product.getRelativeUrl())
self.assertFalse(self.web_site.SaleOrder_isShoppingCartEmpty()) self.assertFalse(self.website.SaleOrder_isShoppingCartEmpty())
def test_02_AddSameResourceToShoppingCart(self): def test_02_AddSameResourceToShoppingCart(self):
""" """
...@@ -378,10 +381,10 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -378,10 +381,10 @@ class TestCommerce(ERP5TypeTestCase):
# add in two steps same product and check that we do not create # add in two steps same product and check that we do not create
# new Sale Order Line but just increase quantity on existing one # new Sale Order Line but just increase quantity on existing one
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
shoppping_cart_item_list = self.web_site.SaleOrder_getShoppingCartItemList() shoppping_cart_item_list = self.website.SaleOrder_getShoppingCartItemList()
self.assertEquals(1, len(shoppping_cart_item_list)) self.assertEquals(1, len(shoppping_cart_item_list))
self.assertEquals(2, shoppping_cart_item_list[0].getQuantity()) self.assertEquals(2, shoppping_cart_item_list[0].getQuantity())
...@@ -396,10 +399,10 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -396,10 +399,10 @@ class TestCommerce(ERP5TypeTestCase):
another_product = self.getDefaultProduct(id='2') another_product = self.getDefaultProduct(id='2')
# add second diff product and check that we create new Sale Order Line # add second diff product and check that we create new Sale Order Line
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
self.web_site.Resource_addToShoppingCart(another_product, 1) self.website.Resource_addToShoppingCart(another_product, 1)
shoppping_cart_item_list = self.web_site.SaleOrder_getShoppingCartItemList() shoppping_cart_item_list = self.website.SaleOrder_getShoppingCartItemList()
self.assertEquals(2, len(shoppping_cart_item_list)) self.assertEquals(2, len(shoppping_cart_item_list))
self.assertEquals(2, shoppping_cart_item_list[0].getQuantity()) self.assertEquals(2, shoppping_cart_item_list[0].getQuantity())
self.assertEquals(1, shoppping_cart_item_list[1].getQuantity()) self.assertEquals(1, shoppping_cart_item_list[1].getQuantity())
...@@ -408,28 +411,27 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -408,28 +411,27 @@ class TestCommerce(ERP5TypeTestCase):
self.assertEquals(shoppping_cart_item_list[1].getResource(), \ self.assertEquals(shoppping_cart_item_list[1].getResource(), \
another_product.getRelativeUrl()) another_product.getRelativeUrl())
def test_04_CalculateTotaShoppingCartPrice(self): def test_04_CalculateTotaShoppingCartPrice(self):
""" """
Test calculation shopping cart's total price. Test calculation shopping cart's total price.
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
another_product = self.getDefaultProduct(id='2') another_product = self.getDefaultProduct(id='2')
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
self.web_site.Resource_addToShoppingCart(another_product, 1) self.website.Resource_addToShoppingCart(another_product, 1)
shopping_cart = self.portal.SaleOrder_getShoppingCart() shopping_cart = self.portal.SaleOrder_getShoppingCart()
self.assertEquals(40.0, \ self.assertEquals(40.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice())) float(self.website.SaleOrder_getShoppingCartTotalPrice()))
# include taxes (by default it's 20%) # include taxes (by default it's 20%)
self.assertEquals(40.0*1.20, \ self.assertEquals(40.0 * 1.20, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True, include_shipping=True,
include_taxes=True))) include_taxes=True)))
# no shipping selected yet so price should be the same # no shipping selected yet so price should be the same
self.assertEquals(40.0, \ self.assertEquals(40.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True))) include_shipping=True)))
# add shipping # add shipping
...@@ -439,12 +441,12 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -439,12 +441,12 @@ class TestCommerce(ERP5TypeTestCase):
# test price calculation only with shipping # test price calculation only with shipping
self.assertEquals(40.0 + 10.0, \ self.assertEquals(40.0 + 10.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True))) include_shipping=True)))
# test price calculation shipping and taxes # test price calculation shipping and taxes
self.assertEquals((40.0 + 10.0)*1.20, \ self.assertEquals((40.0 + 10.0) * 1.20, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True, include_shipping=True,
include_taxes=True))) include_taxes=True)))
...@@ -456,8 +458,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -456,8 +458,8 @@ class TestCommerce(ERP5TypeTestCase):
another_product = self.getDefaultProduct(id='2') another_product = self.getDefaultProduct(id='2')
shipping = self.getDefaultProduct('3') shipping = self.getDefaultProduct('3')
self.web_site.Resource_addToShoppingCart(default_product, quantity=1) self.website.Resource_addToShoppingCart(default_product, quantity=1)
self.web_site.Resource_addToShoppingCart(another_product, quantity=1) self.website.Resource_addToShoppingCart(another_product, quantity=1)
shopping_cart = self.portal.SaleOrder_getShoppingCart() shopping_cart = self.portal.SaleOrder_getShoppingCart()
shipping_url = shipping.getRelativeUrl() shipping_url = shipping.getRelativeUrl()
...@@ -467,32 +469,32 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -467,32 +469,32 @@ class TestCommerce(ERP5TypeTestCase):
field_my_shipping_method=shipping_url) field_my_shipping_method=shipping_url)
# test price calculation without shipping and without taxes # test price calculation without shipping and without taxes
self.assertEquals((10.0*2 + 20.0*1)*1.0, \ self.assertEquals((10.0 * 2 + 20.0 * 1) * 1.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=False, include_shipping=False,
include_taxes=False))) include_taxes=False)))
# test price calculation with shipping and without taxes # test price calculation with shipping and without taxes
self.assertEquals((10.0*2 + 20.0*1 + 10.0)*1.0, \ self.assertEquals((10.0 * 2 + 20.0 * 1 + 10.0) * 1.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True, include_shipping=True,
include_taxes=False))) include_taxes=False)))
# test price calculation with shipping and with taxes # test price calculation with shipping and with taxes
self.assertEquals((10.0*2 + 20.0*1 + 10.0)*1.20, \ self.assertEquals((10.0 * 2 + 20.0 * 1 + 10.0) * 1.20, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True, include_shipping=True,
include_taxes=True))) include_taxes=True)))
# delete shopping item # delete shopping item
self.portal.SaleOrder_deleteShoppingCartItem('1') self.portal.SaleOrder_deleteShoppingCartItem('1')
self.assertEquals(1, \ self.assertEquals(1, \
len(self.web_site.SaleOrder_getShoppingCartItemList())) len(self.website.SaleOrder_getShoppingCartItemList()))
self.portal.SaleOrder_deleteShoppingCartItem('2') self.portal.SaleOrder_deleteShoppingCartItem('2')
self.assertEquals(0, \ self.assertEquals(0, \
len(self.web_site.SaleOrder_getShoppingCartItemList())) len(self.website.SaleOrder_getShoppingCartItemList()))
self.assertEquals(0.0, \ self.assertEquals(0.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice())) float(self.website.SaleOrder_getShoppingCartTotalPrice()))
def test_06_TestClearShoppingCart(self): def test_06_TestClearShoppingCart(self):
""" """
...@@ -503,9 +505,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -503,9 +505,8 @@ class TestCommerce(ERP5TypeTestCase):
transaction.commit() transaction.commit()
self.tic() self.tic()
shopping_cart = self.web_site.SaleOrder_getShoppingCart(action='reset') shopping_cart = self.website.SaleOrder_getShoppingCart(action='reset')
self.assertEquals(0, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(self.website.SaleOrder_getShoppingCartItemList()))
def test_07_SessionIDGeneration(self): def test_07_SessionIDGeneration(self):
""" """
...@@ -527,21 +528,23 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -527,21 +528,23 @@ class TestCommerce(ERP5TypeTestCase):
""" """
Test the Person_getApplicableTaxList script Test the Person_getApplicableTaxList script
""" """
# XXX : actually the script is only in squeleton mode, only return a tax of 20% # XXX : actually the script is only in squeleton mode,
self.assertEquals({'VAT': 20.0}, self.getPortal().Person_getApplicableTaxList()) # only return a tax of 20%
self.assertEquals({'VAT': 20.0},
self.getPortal().Person_getApplicableTaxList())
def test_09_paymentRedirect(self): def test_09_paymentRedirect(self):
""" """
Test the SaleOrder_paymentRedirect script Test the SaleOrder_paymentRedirect script
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
self.web_site.Resource_addToShoppingCart(default_product, quantity=1) self.website.Resource_addToShoppingCart(default_product, quantity=1)
transaction.commit() transaction.commit()
self.tic() self.tic()
# the confirmation should not be possible if the user is not logged # the confirmation should not be possible if the user is not logged
self.logout() self.logout()
self.assertEquals(1, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(1, len(self.website.SaleOrder_getShoppingCartItemList()))
self.portal.SaleOrder_paymentRedirect() self.portal.SaleOrder_paymentRedirect()
self.assertTrue(urllib.quote("You need to create an account to " \ self.assertTrue(urllib.quote("You need to create an account to " \
"continue. If you already have please login.") in "continue. If you already have please login.") in
...@@ -558,8 +561,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -558,8 +561,8 @@ class TestCommerce(ERP5TypeTestCase):
Test the SaleOrder_deleteShoppingCartItem script Test the SaleOrder_deleteShoppingCartItem script
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
self.web_site.Resource_addToShoppingCart(default_product, quantity=1) self.website.Resource_addToShoppingCart(default_product, quantity=1)
self.assertEquals(1, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(1, len(self.website.SaleOrder_getShoppingCartItemList()))
# Trying to remove # Trying to remove
self.portal.SaleOrder_deleteShoppingCartItem() self.portal.SaleOrder_deleteShoppingCartItem()
...@@ -567,7 +570,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -567,7 +570,7 @@ class TestCommerce(ERP5TypeTestCase):
self.app.REQUEST.RESPONSE.getHeader('location')) self.app.REQUEST.RESPONSE.getHeader('location'))
# Check if the item still into the Shopping Cart # Check if the item still into the Shopping Cart
self.assertEquals(1, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(1, len(self.website.SaleOrder_getShoppingCartItemList()))
# Remove the product from the Shopping Cart # Remove the product from the Shopping Cart
product_id = default_product.getId() product_id = default_product.getId()
...@@ -580,31 +583,31 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -580,31 +583,31 @@ class TestCommerce(ERP5TypeTestCase):
self.app.REQUEST.RESPONSE.getHeader('location')) self.app.REQUEST.RESPONSE.getHeader('location'))
# Check if the Shopping Cart is empty # Check if the Shopping Cart is empty
self.assertEquals(0, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(self.website.SaleOrder_getShoppingCartItemList()))
def test_11_finalizeShopping(self): def test_11_finalizeShopping(self):
""" """
Test the SaleOrder_finalizeShopping script Test the SaleOrder_finalizeShopping script
""" """
self.login('webmaster') self.login('webmaster')
self.web_site.Resource_addToShoppingCart(self.getDefaultProduct(), self.website.Resource_addToShoppingCart(self.getDefaultProduct(),
quantity=1) quantity=1)
self.web_site.Resource_addToShoppingCart(self.getDefaultProduct('2'), self.website.Resource_addToShoppingCart(self.getDefaultProduct('2'),
quantity=1) quantity=1)
transaction.commit() transaction.commit()
self.tic() self.tic()
self.assertEquals(2, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(2, len(self.website.SaleOrder_getShoppingCartItemList()))
self.assertEquals(0, len(self.portal.sale_order_module.contentValues())) self.assertEquals(0, len(self.portal.sale_order_module.contentValues()))
self.web_site.SaleOrder_finalizeShopping() self.website.SaleOrder_finalizeShopping()
transaction.commit() transaction.commit()
self.tic() self.tic()
sale_order_object_list = self.portal.sale_order_module.contentValues() sale_order_object_list = self.portal.sale_order_module.contentValues()
self.assertEquals(1, len(sale_order_object_list)) self.assertEquals(1, len(sale_order_object_list))
self.assertEquals(2, len(sale_order_object_list[0].contentValues())) self.assertEquals(2, len(sale_order_object_list[0].contentValues()))
self.assertEquals(0, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(self.website.SaleOrder_getShoppingCartItemList()))
def test_12_getAvailableShippingResourceList(self): def test_12_getAvailableShippingResourceList(self):
""" """
...@@ -634,7 +637,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -634,7 +637,7 @@ class TestCommerce(ERP5TypeTestCase):
self.assertEqual( self.assertEqual(
sale_order.getCreationDate().strftime('%a, %d %b %Y %H:%M %p'), sale_order.getCreationDate().strftime('%a, %d %b %Y %H:%M %p'),
sale_order.SaleOrder_getFormattedCreationDate()) sale_order.SaleOrder_getFormattedCreationDate())
self.assertEqual('%s %s' %('20.0', sale_order.getPriceCurrencyTitle()), self.assertEqual('%s %s' % ('20.0', sale_order.getPriceCurrencyTitle()),
sale_order.SaleOrder_getFormattedTotalPrice()) sale_order.SaleOrder_getFormattedTotalPrice())
def test_14_getSelectedShippingResource(self): def test_14_getSelectedShippingResource(self):
...@@ -642,7 +645,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -642,7 +645,7 @@ class TestCommerce(ERP5TypeTestCase):
Test the SaleOrder_getSelectedShippingResource script Test the SaleOrder_getSelectedShippingResource script
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
shopping_cart = self.portal.SaleOrder_getShoppingCart() shopping_cart = self.portal.SaleOrder_getShoppingCart()
shipping_list = self.portal.SaleOrder_getAvailableShippingResourceList() shipping_list = self.portal.SaleOrder_getAvailableShippingResourceList()
...@@ -665,13 +668,13 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -665,13 +668,13 @@ class TestCommerce(ERP5TypeTestCase):
""" """
currency = self.portal.restrictedTraverse('currency_module/EUR') currency = self.portal.restrictedTraverse('currency_module/EUR')
self.assertEquals(currency, self.assertEquals(currency,
self.web_site.WebSite_getShoppingCartDefaultCurrency()) self.website.WebSite_getShoppingCartDefaultCurrency())
self.assertEquals(currency.getReference(), self.assertEquals(currency.getReference(),
self.web_site.WebSite_getShoppingCartDefaultCurrencyCode()) self.website.WebSite_getShoppingCartDefaultCurrencyCode())
self.assertEquals(currency.getShortTitle(), self.assertEquals(currency.getShortTitle(),
self.web_site.WebSite_getShoppingCartDefaultCurrencySymbol()) self.website.WebSite_getShoppingCartDefaultCurrencySymbol())
def test_16_simulatePaypalPayment(self): def test_16_simulatePaypalPayment(self):
""" """
...@@ -683,7 +686,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -683,7 +686,8 @@ class TestCommerce(ERP5TypeTestCase):
if method_id in custom_skin.objectIds(): if method_id in custom_skin.objectIds():
custom_skin.manage_delObjects([method_id]) custom_skin.manage_delObjects([method_id])
custom_skin.manage_addProduct['PythonScripts']\ custom_skin.manage_addProduct['PythonScripts']\
.manage_addPythonScript(id = method_id) .manage_addPythonScript(id=method_id)
script = custom_skin[method_id] script = custom_skin[method_id]
script.ZPythonScript_edit('parameter_dict, nvp_url', script.ZPythonScript_edit('parameter_dict, nvp_url',
SIMULATE_PAYPAL_SERVER) SIMULATE_PAYPAL_SERVER)
...@@ -691,9 +695,9 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -691,9 +695,9 @@ class TestCommerce(ERP5TypeTestCase):
self.portal.changeSkin('View') self.portal.changeSkin('View')
#1 initialise a website #1 initialise a website
self.web_site.setProperty('ecommerce_paypal_username', 'user') self.website.setProperty('ecommerce_paypal_username', 'user')
self.web_site.setProperty('ecommerce_paypal_password', 'pass') self.website.setProperty('ecommerce_paypal_password', 'pass')
self.web_site.setProperty('ecommerce_paypal_signature', 'signature') self.website.setProperty('ecommerce_paypal_signature', 'signature')
#2 login and activate a cart #2 login and activate a cart
self.login('webmaster') self.login('webmaster')
...@@ -704,7 +708,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -704,7 +708,7 @@ class TestCommerce(ERP5TypeTestCase):
self.createShoppingCartWithProductListAndShipping() self.createShoppingCartWithProductListAndShipping()
#4 : paypal step 1 : get a new token #4 : paypal step 1 : get a new token
token = self.web_site.checkout.WebSection_getNewPaypalToken() token = self.website.checkout.WebSection_getNewPaypalToken()
self.assertNotEquals(token, None) self.assertNotEquals(token, None)
#5 : paypal step 2 : go to paypal and confirm this token #5 : paypal step 2 : go to paypal and confirm this token
...@@ -713,21 +717,21 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -713,21 +717,21 @@ class TestCommerce(ERP5TypeTestCase):
request.set('PayerID', 'THEPAYERID') request.set('PayerID', 'THEPAYERID')
#6 : paypal step 3 : check if this token is confirmed by paypal #6 : paypal step 3 : check if this token is confirmed by paypal
error = self.web_site.WebSection_checkPaypalIdentification() error = self.website.WebSection_checkPaypalIdentification()
self.assertEquals(error, None) self.assertEquals(error, None)
self.assertTrue('/checkout' in request.RESPONSE.getHeader('location')) self.assertTrue('/checkout' in request.RESPONSE.getHeader('location'))
#7 : paypal step 4 : validate the payment #7 : paypal step 4 : validate the payment
self.assertEquals(1, self.assertEquals(1,
len(self.web_site.SaleOrder_getShoppingCartItemList())) len(self.website.SaleOrder_getShoppingCartItemList()))
self.assertEquals(0, len(self.portal.sale_order_module.contentValues())) self.assertEquals(0, len(self.portal.sale_order_module.contentValues()))
self.web_site.WebSection_doPaypalPayment(token=token) self.website.WebSection_doPaypalPayment(token=token)
transaction.commit() transaction.commit()
self.tic() self.tic()
#8 check if sale order created #8 check if sale order created
self.assertEquals(0, len(self.web_site.SaleOrder_getShoppingCartItemList())) self.assertEquals(0, len(self.website.SaleOrder_getShoppingCartItemList()))
self.assertEquals(1, len(self.portal.sale_order_module.contentValues())) self.assertEquals(1, len(self.portal.sale_order_module.contentValues()))
custom_skin.manage_delObjects([method_id]) custom_skin.manage_delObjects([method_id])
...@@ -741,7 +745,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -741,7 +745,7 @@ class TestCommerce(ERP5TypeTestCase):
netbook_product = self.getDefaultProduct(id='2') netbook_product = self.getDefaultProduct(id='2')
netbook_product.setProductLine('ldlc/laptop') netbook_product.setProductLine('ldlc/laptop')
self.web_site.WebSection_generateSectionFromCategory( self.website.WebSection_generateSectionFromCategory(
category='product_line/ldlc', category='product_line/ldlc',
section_id='product_section', section_id='product_section',
depth=2) depth=2)
...@@ -749,11 +753,11 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -749,11 +753,11 @@ class TestCommerce(ERP5TypeTestCase):
self.tic() self.tic()
self.assertEquals(14, self.assertEquals(14,
len(self.web_site.product_section.WebSection_getProductList())) len(self.website.product_section.WebSection_getProductList()))
self.assertEquals(8, self.assertEquals(8,
len(self.web_site.product_section.laptop.WebSection_getProductList())) len(self.website.product_section.laptop.WebSection_getProductList()))
netbook_section = self.web_site.product_section.laptop.netbook netbook_section = self.website.product_section.laptop.netbook
self.assertEquals(3, len(netbook_section.WebSection_getProductList())) self.assertEquals(3, len(netbook_section.WebSection_getProductList()))
def test_18_editShoppingCardWithABlankShippingMethod(self): def test_18_editShoppingCardWithABlankShippingMethod(self):
...@@ -762,9 +766,9 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -762,9 +766,9 @@ class TestCommerce(ERP5TypeTestCase):
blank shipping method and it will not break. blank shipping method and it will not break.
""" """
default_product = self.getDefaultProduct() default_product = self.getDefaultProduct()
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
shopping_cart = self.web_site.SaleOrder_getShoppingCart() shopping_cart = self.website.SaleOrder_getShoppingCart()
self.assertFalse(hasattr(shopping_cart, 'shipping_method')) self.assertFalse(hasattr(shopping_cart, 'shipping_method'))
self.portal.SaleOrder_editShoppingCart(field_my_shipping_method='') self.portal.SaleOrder_editShoppingCart(field_my_shipping_method='')
...@@ -783,26 +787,26 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -783,26 +787,26 @@ class TestCommerce(ERP5TypeTestCase):
selecting a shipping method without price. selecting a shipping method without price.
""" """
default_product = self.getDefaultProduct(id='1') default_product = self.getDefaultProduct(id='1')
self.web_site.Resource_addToShoppingCart(default_product, 1) self.website.Resource_addToShoppingCart(default_product, 1)
shopping_cart = self.web_site.SaleOrder_getShoppingCart() shopping_cart = self.website.SaleOrder_getShoppingCart()
# add shipping # add shipping
shipping = self.getDefaultProduct('3') shipping = self.getDefaultProduct('3')
shipping.setBasePrice(None) shipping.setBasePrice(None)
self.web_site.SaleOrder_editShoppingCart( self.website.SaleOrder_editShoppingCart(
field_my_shipping_method=shipping.getRelativeUrl()) field_my_shipping_method=shipping.getRelativeUrl())
self.assertEquals(10.0, \ self.assertEquals(10.0, \
float(self.web_site.SaleOrder_getShoppingCartTotalPrice( float(self.website.SaleOrder_getShoppingCartTotalPrice(
include_shipping=True))) include_shipping=True)))
def test_20_getProductListFromWebSite(self): def test_20_getProductListFromWebSite(self):
""" """
Test the WebSite_getProductList script. Test the WebSite_getProductList script.
""" """
self.assertEquals(5, len(self.web_site.WebSite_getProductList())) self.assertEquals(5, len(self.website.WebSite_getProductList()))
self.assertEquals(16, self.assertEquals(16,
len(self.web_site.WebSite_getProductList(limit=1000))) len(self.website.WebSite_getProductList(limit=1000)))
def test_21_AddResourceToShoppingCartWithAnonymousUser(self): def test_21_AddResourceToShoppingCartWithAnonymousUser(self):
""" """
...@@ -811,7 +815,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -811,7 +815,7 @@ class TestCommerce(ERP5TypeTestCase):
# anonymous user # anonymous user
self.logout() self.logout()
self.createShoppingCartWithProductListAndShipping() self.createShoppingCartWithProductListAndShipping()
shoppping_cart_item_list = self.web_site.SaleOrder_getShoppingCartItemList() shoppping_cart_item_list = self.website.SaleOrder_getShoppingCartItemList()
self.assertEquals(1, len(shoppping_cart_item_list)) self.assertEquals(1, len(shoppping_cart_item_list))
def test_22_createShoppingCartWithAnonymousAndLogin(self): def test_22_createShoppingCartWithAnonymousAndLogin(self):
...@@ -830,8 +834,8 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -830,8 +834,8 @@ class TestCommerce(ERP5TypeTestCase):
password='secret', password='secret',
password_confirm='secret') password_confirm='secret')
for key, item in kw.items(): for key, item in kw.items():
self.app.REQUEST.set('field_your_%s' %key, item) self.app.REQUEST.set('field_your_%s' % key, item)
self.web_site.WebSite_createWebSiteAccount('WebSite_viewRegistrationDialog') self.website.WebSite_createWebSiteAccount('WebSite_viewRegistrationDialog')
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -846,11 +850,11 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -846,11 +850,11 @@ class TestCommerce(ERP5TypeTestCase):
for a given Authenticated Member it should return the person value. for a given Authenticated Member it should return the person value.
""" """
self.logout() self.logout()
person_object = self.web_site.SaleOrder_getShoppingCartCustomer() person_object = self.website.SaleOrder_getShoppingCartCustomer()
self.assertEquals(person_object, None) self.assertEquals(person_object, None)
self.login('webmaster') self.login('webmaster')
person_object = self.web_site.SaleOrder_getShoppingCartCustomer() person_object = self.website.SaleOrder_getShoppingCartCustomer()
self.assertNotEquals(person_object, None) self.assertNotEquals(person_object, None)
self.assertEquals(person_object.getReference(), 'webmaster') self.assertEquals(person_object.getReference(), 'webmaster')
...@@ -876,7 +880,7 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -876,7 +880,7 @@ class TestCommerce(ERP5TypeTestCase):
information. information.
""" """
self.logout() self.logout()
self.assertNotEquals(self.web_site.sale_order_module.absolute_url(), None) self.assertNotEquals(self.website.sale_order_module.absolute_url(), None)
def test_26_getShoppingCartDefaultCurrencyWithAnonymousUser(self): def test_26_getShoppingCartDefaultCurrencyWithAnonymousUser(self):
""" """
...@@ -888,16 +892,16 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -888,16 +892,16 @@ class TestCommerce(ERP5TypeTestCase):
- WebSite_getShoppingCartDefaultCurrencySymbol - WebSite_getShoppingCartDefaultCurrencySymbol
""" """
self.logout() self.logout()
currency_url = self.web_site.getLayoutProperty('ecommerce_base_currency') currency_url = self.website.getLayoutProperty('ecommerce_base_currency')
currency_object = self.portal.restrictedTraverse(currency_url) currency_object = self.portal.restrictedTraverse(currency_url)
self.assertEquals(currency_object, self.assertEquals(currency_object,
self.web_site.WebSite_getShoppingCartDefaultCurrency()) self.website.WebSite_getShoppingCartDefaultCurrency())
self.assertEquals(currency_object.getReference(), self.assertEquals(currency_object.getReference(),
self.web_site.WebSite_getShoppingCartDefaultCurrencyCode()) self.website.WebSite_getShoppingCartDefaultCurrencyCode())
self.assertEquals(currency_object.getShortTitle(), self.assertEquals(currency_object.getShortTitle(),
self.web_site.WebSite_getShoppingCartDefaultCurrencySymbol()) self.website.WebSite_getShoppingCartDefaultCurrencySymbol())
def test_27_ResourceGetShopUrl(self): def test_27_ResourceGetShopUrl(self):
""" """
...@@ -915,11 +919,11 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -915,11 +919,11 @@ class TestCommerce(ERP5TypeTestCase):
""" """
self.login('webmaster') self.login('webmaster')
comment = 'TESTING COMMENT' comment = 'TESTING COMMENT'
self.web_site.Resource_addToShoppingCart(self.getDefaultProduct(), self.website.Resource_addToShoppingCart(self.getDefaultProduct(),
quantity=1) quantity=1)
self.web_site.SaleOrder_paymentRedirect(field_my_comment=comment) self.website.SaleOrder_paymentRedirect(field_my_comment=comment)
self.web_site.SaleOrder_finalizeShopping() self.website.SaleOrder_finalizeShopping()
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -927,8 +931,9 @@ class TestCommerce(ERP5TypeTestCase): ...@@ -927,8 +931,9 @@ class TestCommerce(ERP5TypeTestCase):
self.assertEquals(comment, sale_order_object_list[0].getComment()) self.assertEquals(comment, sale_order_object_list[0].getComment())
import unittest import unittest
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestCommerce)) suite.addTest(unittest.makeSuite(TestCommerce))
return suite return suite
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7