only two tests need a fix. Starting to clear deprecation warnings.

spec/models/order_spec.rb

@@ -4,9 +4,9 @@ describe Spree::Order do
   context "#add_variant" do
     it "should add digital Variants of quantity 1 to an order" do
       order = FactoryGirl.create(:order)
-      order.add_variant variant1 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant variant2 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant variant3 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+      order.contents.add variant1 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
+      order.contents.add variant2 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
+      order.contents.add variant3 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       order.line_items.first.variant.should == variant1
       order.line_items.second.variant.should == variant2
       order.line_items.third.variant.should == variant3
@@ -15,9 +15,9 @@ describe Spree::Order do
     it "should handle quantity higher than 1 when adding one specific digital Variant" do
       order = FactoryGirl.create(:order)
       digital_variant = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant digital_variant, 3
+      order.contents.add digital_variant, 3
       order.line_items.first.quantity.should == 3
-      order.add_variant digital_variant, 2
+      order.contents.add digital_variant, 2
       order.line_items.first.quantity.should == 5
     end
   end
@@ -26,21 +26,21 @@ describe Spree::Order do
     it "should understand that all products are digital" do
       order = FactoryGirl.create(:order)
       3.times do
-        order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+        order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       end
       order.digital?.should be_true
-      order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
+      order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
       order.digital?.should be_true
     end
     
     it "should understand that not all products are digital" do
       order = FactoryGirl.create(:order)
       3.times do
-        order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+        order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       end
-      order.add_variant FactoryGirl.create(:variant) # this is the analog product
+      order.contents.add FactoryGirl.create(:variant), 1 # this is the analog product
       order.digital?.should be_false
-      order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
+      order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
       order.digital?.should be_false
     end
   end
@@ -53,7 +53,7 @@ describe Spree::Order do
       @order.bill_address = FactoryGirl.create :address
       @order.save!
 
-      3.times { @order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]) }
+      3.times { @order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1 }
 
       FactoryGirl.create :digital_shipping_method
       s = FactoryGirl.create :shipping_method
@@ -64,14 +64,15 @@ describe Spree::Order do
 
     it "should only offer digital shipping if all items are digital" do
       order.digital?.should be_true
-      order.rate_hash.count.should == 1
-      order.rate_hash.first.shipping_method.calculator.class.should == Spree::Calculator::DigitalDelivery
-      order.rate_hash.first.cost.should == 0.0
+      order.create_proposed_shipments
+      order.shipping_rates.count.should == 1
+      order.shipping_rates.first.shipping_method.calculator.class.should == Spree::Calculator::DigitalDelivery
+      order.shipping_rates.first.cost.should == 0.0
     end
 
     it "should not offer digital shipping if only some items are digital" do
       order.digital?.should be_true
-      order.add_variant FactoryGirl.create(:variant) # this is the analog product
+      order.contents.add FactoryGirl.create(:variant), 1 # this is the analog product
       order.digital?.should be_false
 
       order.rate_hash.count.should == 1