Fix cart cleaning with path-specific cookie

Antonio Terceiro
1 parent c553ad10
Showing 2 changed files with 16 additions and 3 deletions Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
@@ -109,6 +109,7 @@ class ShoppingCartPluginController &lt; PublicController
       enterprise = Enterprise.find(cart[:enterprise_id])
       ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items])
       ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items])
+      self.cart = nil
       render :text => {
         :ok => true,
         :message => _('Request sent successfully. Check your email.'),
@@ -279,7 +280,11 @@ class ShoppingCartPluginController &lt; PublicController
   after_filter :save_cookie
   def save_cookie
     if @cart.nil?
-      cookies.delete(cookie_key)
+      cookies[cookie_key] = {
+        :value => '',
+        :path => '/plugin/shopping_cart',
+        :expires => 1.year.ago,
+      }
     else
       cookies[cookie_key] = {
         :value => Base64.encode64(@cart.to_yaml),
@@ -16,9 +16,10 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
   attr_reader :enterprise
   attr_reader :product
-  should 'return no cookie for an empty cart' do
+  should 'force cookie expiration with explicit path for an empty cart' do
     get :get
-    assert_nil @response.cookies[:_noosfero_plugin_shopping_cart]
+    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}/}
   end
   should 'add a new product to cart' do
@@ -180,6 +181,13 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
     assert_equal 0, order.products_list[product1.id][:price]
   end
+  should 'clean the cart after placing the order' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    post :add, :id => product1.id
+    post :send_request, :customer => { :name => "Manuel", :email => "manuel@ceu.com" }
+    assert !cart?, "cart expected to be empty!"
+  end
+
   private
   def json_response