Set state_name when state record not found [api]

api/app/models/spree/order_decorator.rb

@@ -153,7 +153,12 @@ def self.ensure_state_id_from_api(address)
       end
 
       address.delete(:state)
-      address[:state_id] = Spree::State.where(search).first!.id
+
+      if state = Spree::State.where(search).first
+        address[:state_id] = state.id
+      else
+        address[:state_name] = search[:name] || search[:abbr]
+      end
     rescue Exception => e
       raise "#{e.message} #{search}"
     end

api/spec/models/spree/order_spec.rb

@@ -130,23 +130,22 @@ module Spree
 
     it 'can build an order from API with state attributes' do
       ship_address.delete(:state_id)
-      ship_address[:state] = { 'name' => 'Alabama' }
+      ship_address[:state] = { 'name' => state.name }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
       order = Order.build_from_api(user, params)
       order.ship_address.state.name.should eq 'Alabama'
     end
 
-    it 'handles state lookup exceptions' do
+    it 'sets state name if state record not found' do
       ship_address.delete(:state_id)
       ship_address[:state] = { 'name' => 'XXX' }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
-      expect {
-        order = Order.build_from_api(user, params)
-      }.to raise_error /XXX/
+      order = Order.build_from_api(user, params)
+      expect(order.ship_address.state_name).to eq 'XXX'
     end
 
     context 'variant not deleted' do
@@ -190,13 +189,6 @@ module Spree
       end
     end
 
-    it "raises with proper message when cant find state" do
-      address = { :state => { "name" => "NoNoState" } }
-      expect {
-        Order.ensure_state_id_from_api(address)
-      }.to raise_error /NoNoState/
-    end
-
     context "shippments" do
       let(:params) do
         { :shipments_attributes => [