From f848b28053d024141759b03da7fdc600c27e5bbc Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 21 Aug 2013 19:50:29 -0300 Subject: [PATCH] [plugins-tests] Fixing shopping_cart tests --- plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb | 1 + plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb | 2 +- plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb index e34816f..153c58f 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb @@ -63,6 +63,7 @@ class ShoppingCartPluginMyprofileController < MyProfileController def treat_delivery_options(params) result = {} + return result if params.nil? || params[:delivery_options].nil? params[:options].size.times do |counter| if params[:options][counter].present? && params[:prices][counter].present? result[params[:options][counter]] = params[:prices][counter] diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb index 9a36f51..2203bc7 100644 --- a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb +++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb @@ -38,7 +38,7 @@ class ShoppingCartPlugin::CartHelperTest < ActiveSupport::TestCase value = 13.7 environment = Environment.default - assert_equal "#{environment.currency_unit} 13#{environment.currency_separator}70", float_to_currency_cart(value,environment) + assert_equal "#{environment.currency_unit}13#{environment.currency_separator}70", float_to_currency_cart(value,environment) end end diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb index 8ada470..2cb69f0 100644 --- a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb +++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb @@ -19,10 +19,9 @@ class ShoppingCartPluginTest < ActiveSupport::TestCase end should 'not add button if product unavailable' do - product = fast_create(Product, :available => false) - enterprise = mock() + enterprise = fast_create(:enterprise) + product = fast_create(Product, :available => false, :enterprise_id => enterprise.id) enterprise.stubs(:shopping_cart).returns(true) - product.stubs(:enterprise).returns(enterprise) assert_nil shopping_cart.add_to_cart_button(product) end -- libgit2 0.21.2