spree_api 2.1.1 → 2.1.2

data/spec/controllers/spree/api/stock_movements_controller_spec.rb

@@ -13,41 +13,65 @@ module Spree
       stub_authentication!
     end
 
-    it 'gets list of stock movements' do
-      api_get :index, stock_location_id: stock_location.to_param
-      json_response['stock_movements'].first.should have_attributes(attributes)
-      json_response['stock_movements'].first['stock_item']['count_on_hand'].should eq 11
-    end
-
-    it 'requires a stock_location_id to be passed as a parameter' do
-      api_get :index
-      json_response['error'].should =~ /stock_location_id parameter must be provided/
-      response.status.should == 422
-    end
+    context 'as a user' do
+      it 'cannot see a list of stock movements' do
+        api_get :index, stock_location_id: stock_location.to_param
+        response.status.should == 404
+      end
 
-    it 'can control the page size through a parameter' do
-      create(:stock_movement, stock_item: stock_item)
-      api_get :index, stock_location_id: stock_location.to_param, per_page: 1
-      json_response['count'].should == 1
-      json_response['current_page'].should == 1
-      json_response['pages'].should == 2
-    end
+      it 'cannot see a stock movement' do
+        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.id
+        response.status.should == 404
+      end
 
-    it 'can query the results through a paramter' do
-      expected_result = create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
-      api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
-      json_response['count'].should == 1
-    end
+      it 'cannot create a stock movement' do
+        params = {
+          stock_location_id: stock_location.to_param,
+          stock_movement: {
+            stock_item_id: stock_item.to_param
+          }
+        }
 
-    it 'gets a stock movement' do
-      api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.to_param
-      json_response.should have_attributes(attributes)
-      json_response['stock_item_id'].should eq stock_movement.stock_item_id
+        api_post :create, params
+        response.status.should == 404
+      end
     end
 
     context 'as an admin' do
       sign_in_as_admin!
 
+      it 'gets list of stock movements' do
+        api_get :index, stock_location_id: stock_location.to_param
+        json_response['stock_movements'].first.should have_attributes(attributes)
+        json_response['stock_movements'].first['stock_item']['count_on_hand'].should eq 11
+      end
+
+      it 'requires a stock_location_id to be passed as a parameter' do
+        api_get :index
+        json_response['error'].should =~ /stock_location_id parameter must be provided/
+        response.status.should == 422
+      end
+
+      it 'can control the page size through a parameter' do
+        create(:stock_movement, stock_item: stock_item)
+        api_get :index, stock_location_id: stock_location.to_param, per_page: 1
+        json_response['count'].should == 1
+        json_response['current_page'].should == 1
+        json_response['pages'].should == 2
+      end
+
+      it 'can query the results through a paramter' do
+        expected_result = create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
+        api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
+        json_response['count'].should == 1
+      end
+
+      it 'gets a stock movement' do
+        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.to_param
+        json_response.should have_attributes(attributes)
+        json_response['stock_item_id'].should eq stock_movement.stock_item_id
+      end
+
       it 'can create a new stock movement' do
         params = {
           stock_location_id: stock_location.to_param,

data/spec/controllers/spree/api/zones_controller_spec.rb

@@ -48,13 +48,13 @@ module Spree
       end
 
       it "uses the specified template" do
-        request.headers.env['X-Spree-Template'] = 'show'
+        request.headers['X-Spree-Template'] = 'show'
         api_get :custom_show, :id => @zone.id
         response.should render_template('spree/api/zones/show')
       end
 
       it "falls back to the default template if the specified template does not exist" do
-        request.headers.env['X-Spree-Template'] = 'invoice'
+        request.headers['X-Spree-Template'] = 'invoice'
         api_get :show, :id => @zone.id
         response.should render_template('spree/api/zones/show')
       end

data/spec/models/spree/order_spec.rb

@@ -2,22 +2,25 @@ require 'spec_helper'
 
 module Spree
   describe Order do
-    let!(:country) { FactoryGirl.create(:country) }
-    let!(:state) { country.states.first || FactoryGirl.create(:state, :country => country) }
-    let!(:stock_location) { FactoryGirl.create(:stock_location) }
+    let!(:country) { create(:country) }
+    let!(:state) { country.states.first || create(:state, :country => country) }
+    let!(:stock_location) { create(:stock_location) }
 
     let(:user) { stub_model(LegacyUser, :email => 'fox@mudler.com') }
     let(:shipping_method) { create(:shipping_method) }
     let(:payment_method) { create(:payment_method) }
+
     let(:product) { product = Spree::Product.create(:name => 'Test',
                                            :sku => 'TEST-1',
                                            :price => 33.22)
-                    product.shipping_category = FactoryGirl.create(:shipping_category)
+                    product.shipping_category = create(:shipping_category)
                     product.save
                     product }
+
     let(:variant) { variant = product.master
                     variant.stock_items.each { |si| si.update_attribute(:count_on_hand, 10) }
                     variant }
+
     let(:sku) { variant.sku }
     let(:variant_id) { variant.id }
 
@@ -49,6 +52,12 @@ module Spree
       order.state.should eq 'complete'
     end
 
+    it "assigns order[email] over user email to order" do
+      params = { email: 'wooowww@test.com' }
+      order = Order.build_from_api(user, params)
+      expect(order.email).to eq params[:email]
+    end
+
     it 'can build an order from API with just line items' do
       params = { :line_items_attributes => line_items }
 
@@ -164,6 +173,13 @@ module Spree
       end
     end
 
+    it "raises with proper message when cant find country" do
+      address = { :country => { "name" => "NoNoCountry" } }
+      expect {
+        Order.ensure_country_id_from_api(address)
+      }.to raise_error /NoNoCountry/
+    end
+
     it 'ensures_state_id for state fields' do
       [:name, :abbr].each do |field|
         address = { :state => { field => state.send(field) }}
@@ -172,12 +188,20 @@ 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 => [
             { :tracking => '123456789',
               :cost => '4.99',
               :shipping_method => shipping_method.name,
+              :stock_location => stock_location.name,
               :inventory_units => [{ :sku => sku }]
             }
         ] }
@@ -195,6 +219,14 @@ module Spree
         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
+      end
+
+      it "raises if cant find stock location" do
+        params[:shipments_attributes][0][:stock_location] = "doesnt exist"
+        expect {
+          order = Order.build_from_api(user, params)
+        }.to raise_error
       end
     end
 
@@ -244,5 +276,40 @@ module Spree
         order = Order.build_from_api(user, params)
       }.to raise_error /XXX/
     end
+
+    context "raises error" do
+      it "clears out order from db" do
+        params = { :payments_attributes => [{ payment_method: "XXX" }] }
+        count = Order.count
+
+        expect { order = Order.build_from_api(user, params) }.to raise_error
+        expect(Order.count).to eq count
+      end
+    end
+
+    context "import param and tax adjustments" do
+      let!(:tax_rate) { create(:tax_rate, amount: 0.05, calculator: Calculator::DefaultTax.create) }
+      let(:other_variant) { create(:variant) }
+
+      let(:line_item_attributes) do
+        line_items.merge({ "1" => { :variant_id => other_variant.id, :quantity => 5 }})
+      end
+
+      before { Zone.stub default_tax: tax_rate.zone }
+
+      it "doesnt create any tax ajustments when importing order" do
+        params = { import: true, line_items_attributes: line_item_attributes }
+        expect {
+          Order.build_from_api(user, params)
+        }.not_to change { Adjustment.count }
+      end
+
+      it "does create tax adjustments if not importing order" do
+        params = { import: false, line_items_attributes: line_item_attributes }
+        expect {
+          Order.build_from_api(user, params)
+        }.to change { Adjustment.count }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-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.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - app/views/spree/api/payments/index.v1.rabl
 - app/views/spree/api/payments/new.v1.rabl
 - app/views/spree/api/payments/show.v1.rabl
+- app/views/spree/api/payments/update_forbidden.v1.rabl
 - app/views/spree/api/product_properties/index.v1.rabl
 - app/views/spree/api/product_properties/new.v1.rabl
 - app/views/spree/api/product_properties/show.v1.rabl