Only create an order when adding a product to cart

Everytime user was authenticated an order was created by visiting any
page in frontend (if none were already associated with the current user)

Fixes #4136

core/lib/spree/core/controller_helpers/order.rb

@@ -13,10 +13,12 @@ def self.included(base)
         # The current incomplete order from the session for use in cart and during checkout
         def current_order(create_order_if_necessary = false)
           return @current_order if @current_order
+
           if session[:order_id]
             current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
             @current_order = current_order unless current_order.try(:completed?)
           end
+
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
             @current_order.user ||= try_spree_current_user
@@ -29,6 +31,7 @@ def current_order(create_order_if_necessary = false)
               session[:access_token] = @current_order.token
             end
           end
+
           if @current_order
             @current_order.last_ip_address = ip_address
             session[:order_id] = @current_order.id
@@ -50,7 +53,7 @@ def set_current_order
             last_incomplete_order = user.last_incomplete_spree_order
             if session[:order_id].nil? && last_incomplete_order
               session[:order_id] = last_incomplete_order.id
-            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
+            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order, user)
             end
           end

frontend/app/controllers/spree/orders_controller.rb

@@ -34,7 +34,7 @@ def update
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order(true)
+      @order = current_order || Order.new
       associate_user
     end
 

frontend/spec/controllers/spree/current_order_tracking_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe 'current order tracking' do
+  let(:user) { create(:user) }
+
   controller(Spree::StoreController) do
     def index
       render :nothing => true
@@ -15,9 +17,32 @@ def index
   end
 
   it 'automatically tracks who the order was created by' do
-    user = FactoryGirl.create(:user)
     controller.stub(:try_spree_current_user => user)
     get :index
-    controller.current_order.created_by.should == controller.try_spree_current_user
+    controller.current_order(true).created_by.should == controller.try_spree_current_user
+  end
+
+  context "current order creation" do
+    before { controller.stub(:try_spree_current_user => user) }
+
+    it "doesn't create a new order out of the blue" do
+      expect {
+        spree_get :index
+      }.not_to change { Spree::Order.count }
+    end
+  end
+end
+
+describe Spree::OrdersController do
+  let(:user) { create(:user) }
+
+  before { controller.stub(:try_spree_current_user => user) }
+
+  describe Spree::OrdersController do
+    it "doesn't create a new order out of the blue" do
+      expect {
+        spree_get :edit
+      }.not_to change { Spree::Order.count }
+    end
   end
 end

frontend/spec/controllers/spree/orders_controller_spec.rb

@@ -53,6 +53,7 @@
         end
 
         it "should redirect to cart path (on success)" do
+          controller.stub current_order: order
           order.stub(:update_attributes).and_return true
           spree_put :update, {}, {:order_id => 1}
           response.should redirect_to(spree.cart_path)