From ff8e7e2d24ba4b1e80ce00963616b3ceca7e8441 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 2 Jan 2013 13:38:03 +0000 Subject: [PATCH] Use the appropriate API for deleting a cookie --- plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb | 6 +----- plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb index 949ab8d..afd1c77 100644 --- a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb +++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb @@ -280,11 +280,7 @@ class ShoppingCartPluginController < PublicController after_filter :save_cookie def save_cookie if @cart.nil? - cookies[cookie_key] = { - :value => '', - :path => '/plugin/shopping_cart', - :expires => 1.year.ago, - } + cookies.delete(cookie_key, :path => '/plugin/shopping_cart') else cookies[cookie_key] = { :value => Base64.encode64(@cart.to_yaml), diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb index f303c2d..618ac9f 100644 --- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb +++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb @@ -18,8 +18,7 @@ class ShoppingCartPluginControllerTest < ActionController::TestCase should 'force cookie expiration with explicit path for an empty cart' do get :get - last_year = 1.year.ago.year - assert @response.headers['Set-Cookie'].any? { |c| c =~ /_noosfero_plugin_shopping_cart=; path=\/plugin\/shopping_cart; expires=.*-#{last_year}/} + assert @response.headers['Set-Cookie'].any? { |c| c =~ /_noosfero_plugin_shopping_cart=; path=\/plugin\/shopping_cart; expires=.*-1970/} end should 'add a new product to cart' do -- libgit2 0.21.2