spree_api 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa047ba09ae648902132c95077e64faad8eb1f63
-  data.tar.gz: e2fcbef05544ad3fd2f65f79fca38f175365800e
+  metadata.gz: 987159d621ff7cfdfcdc8fa4db6738e78bb4e4a2
+  data.tar.gz: 44a7a0ec5aff3f2f2b0cbf3a978e47ebe612f742
 SHA512:
-  metadata.gz: 936aed8b8100f9f0e754109c74851a632abd2614e3c9a5951edf06aa782e7b00424bbebcb5665f45992a6295b66337dce4c64cc889e657d82656c2ac0a61ac21
-  data.tar.gz: f4af5a1402eebf511cb0911d26ff65877708f721682cc1e01452e7fb20cbe81ecb0f4e34741dfafa1c3ca35abe2ffc7f8281abcb27d69b59921c27d3faa989f4
+  metadata.gz: c3aebbf513040a6f75ab4f4d76b2d5c35adf90ad1e44b9bc1d37b1103343945ea036fab9465e9874bdcd258d7d93d5e443d4dfd7f37443594382b4684b0b5cb9
+  data.tar.gz: 3af0f7bfb8acc3d11734ac2123216840f1cd733b3207c4152926e62f9274819e774c56afeffa64fc64d8f7a7164aecce1f85f57a8df6904914f9bbe74c51370e

data/app/models/spree/order_decorator.rb

@@ -64,8 +64,9 @@ Spree::Order.class_eval do
         shipment.save!
 
         shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
-        shipment.shipping_rates.create!(:shipping_method => shipping_method,
-                                        :cost => s[:cost])
+        rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
+                                               :cost => s[:cost])
+        shipment.selected_shipping_rate_id = rate.id
       rescue Exception => e
         raise "Order import shipments: #{e.message} #{s}"
       end

data/spec/models/spree/order_spec.rb

@@ -231,8 +231,20 @@ module Spree
         shipment = order.shipments.first
         shipment.inventory_units.first.variant_id.should eq product.master.id
         shipment.tracking.should eq '123456789'
-        shipment.shipping_rates.first.cost.should eq 4.99
-        shipment.stock_location.should eq stock_location
+        rate = shipment.selected_shipping_rate
+        rate.shipping_method.name.should == shipping_method.name
+        rate.cost.should == 4.99
+      end
+
+      it 'handles shipment building exceptions' do
+        params = { :shipments_attributes => [{ :tracking => '123456789',
+                                               :cost => '4.99',
+                                               :shipping_method => 'XXX',
+                                               :inventory_units => [{ :sku => sku }]
+                                             }] }
+        expect {
+          order = Order.build_from_api(user, params)
+        }.to raise_error /XXX/
       end
 
       it "raises if cant find stock location" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Spree's API