spree_minicart 1.1.2 → 1.1.3

data/app/controllers/orders_controller_decorator.rb

@@ -1,13 +1,9 @@
 module Spree
   OrdersController.class_eval do
-    before_filter :set_current_order, :only => [:populate]
 
     respond_to :js, :only => [:populate, :update]
 
     ssl_allowed :populate, :update
 
-    def set_current_order
-      current_order(true)
-    end
   end
 end

data/app/views/spree/orders/populate.js.erb

@@ -1,3 +1,4 @@
+<% current_order and current_order.update! # update to get correct total %>
 // Refresh minicart count
 $("#link-to-cart a").replaceWith('<%= escape_javascript link_to_cart %>')
 

data/app/views/spree/shared/_minicart.html.erb

@@ -12,7 +12,7 @@
     <div data-hook="outside_minicart_form">
       <div id="minicart-details" data-hook="minicart_details" class="clearfix">
         <p>
-          <span><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(current_order.reload) %></span></span>
+          <span><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(current_order) %></span></span>
           <%= link_to t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link' %>
         </p>
       </div>

data/lib/spree_minicart/version.rb

@@ -1,3 +1,3 @@
 module SpreeMinicart
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/requests/minicart_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature "minicart", :js => true do
-  background { @product = FactoryGirl.create(:product, :name => "ror mug", :price => 30) }
+  background { @product = FactoryGirl.create(:product, :name => "ror mug", :price => 30, :on_hand => 2) }
 
   scenario "customer should be able to add and delete a product in the minicart" do
     visit spree.products_path
@@ -100,4 +100,38 @@ feature "minicart", :js => true do
       visit spree.products_path
     }.to_not change(Spree::Order, :count)
   end
+
+  scenario 'with allowbackorders to false minicart should not be able to item multiple time' do
+    reset_spree_preferences do |config|
+      config[:allow_backorders] = false
+    end
+    @product.master.update_column :count_on_hand, 1
+
+    visit spree.products_path
+    click_link("ror mug")
+
+    within("li#link-to-cart") do
+      page.should have_content("Cart: (Empty)")
+    end
+
+    click_button "Add To Cart"
+    click_button "Add To Cart"
+
+    within("#link-to-cart a") do
+      page.should have_content("(2)")
+    end
+
+    within("#minicart") do
+      page.should have_content("ror mug")
+      page.should have_content('Insufficient stock available, only 1 remaining')
+    end
+
+    visit spree.products_path
+
+    within("#link-to-cart a") do
+      page.should have_content("(1)")
+    end
+
+  end
+
 end

data/spec/support/preferences.rb

@@ -0,0 +1,6 @@
+def reset_spree_preferences
+  Spree::Preferences::Store.instance.persistence = false
+  config = Rails.application.config.spree.preferences
+  config.reset
+  yield(config) if block_given?
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_minicart
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -194,6 +194,7 @@ files:
 - script/rails
 - spec/requests/minicart_spec.rb
 - spec/spec_helper.rb
+- spec/support/preferences.rb
 - spec/support/shared_connection.rb
 - spree_minicart.gemspec
 homepage: https://github.com/sbounmy/spree_minicart
@@ -224,4 +225,5 @@ summary: Spree Minicart displays a minicart in your spree store
 test_files:
 - spec/requests/minicart_spec.rb
 - spec/spec_helper.rb
+- spec/support/preferences.rb
 - spec/support/shared_connection.rb