solidus_api 1.2.3 → 1.3.0.beta1

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

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::ReturnAuthorizationsController, :type => :controller do
+  describe Api::ReturnAuthorizationsController, type: :controller do
     render_views
 
     let!(:order) { create(:shipped_order) }
 
     let(:product) { create(:product) }
     let(:attributes) { [:id, :memo, :state] }
-    let(:resource_scoping) { { :order_id => order.to_param } }
+    let(:resource_scoping) { { order_id: order.to_param } }
 
     before do
       stub_authentication!
@@ -18,10 +18,10 @@ module Spree
       it "can create a new return authorization" do
         stock_location = FactoryGirl.create(:stock_location)
         reason = FactoryGirl.create(:return_reason)
-        rma_params = { :stock_location_id => stock_location.id,
-                       :return_reason_id => reason.id,
-                       :memo => "Defective" }
-        api_post :create, :order_id => order.number, :return_authorization => rma_params
+        rma_params = { stock_location_id: stock_location.id,
+                       return_reason_id: reason.id,
+                       memo: "Defective" }
+        api_post :create, order_id: order.number, return_authorization: rma_params
         expect(response.status).to eq(201)
         expect(json_response).to have_attributes(attributes)
         expect(json_response["state"]).not_to be_blank
@@ -30,7 +30,7 @@ module Spree
 
     context "as the order owner" do
       before do
-        allow_any_instance_of(Order).to receive_messages :user => current_api_user
+        allow_any_instance_of(Order).to receive_messages user: current_api_user
       end
 
       it "cannot see any return authorizations" do
@@ -39,7 +39,7 @@ module Spree
       end
 
       it "cannot see a single return authorization" do
-        api_get :show, :id => 1
+        api_get :show, id: 1
         assert_unauthorized!
       end
 
@@ -63,7 +63,7 @@ module Spree
 
     context "as another non-admin user that's not the order's owner" do
       before do
-        allow_any_instance_of(Order).to receive_messages :user => create(:user)
+        allow_any_instance_of(Order).to receive_messages user: create(:user)
       end
 
       it "cannot create a new return authorization" do
@@ -76,18 +76,18 @@ module Spree
       sign_in_as_admin!
 
       it "can show return authorization" do
-        FactoryGirl.create(:return_authorization, :order => order)
+        FactoryGirl.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
-        api_get :show, :order_id => order.number, :id => return_authorization.id
+        api_get :show, order_id: order.number, id: return_authorization.id
         expect(response.status).to eq(200)
         expect(json_response).to have_attributes(attributes)
         expect(json_response["state"]).not_to be_blank
       end
 
       it "can get a list of return authorizations" do
-        FactoryGirl.create(:return_authorization, :order => order)
-        FactoryGirl.create(:return_authorization, :order => order)
-        api_get :index, { :order_id => order.number }
+        FactoryGirl.create(:return_authorization, order: order)
+        FactoryGirl.create(:return_authorization, order: order)
+        api_get :index, { order_id: order.number }
         expect(response.status).to eq(200)
         return_authorizations = json_response["return_authorizations"]
         expect(return_authorizations.first).to have_attributes(attributes)
@@ -95,19 +95,19 @@ module Spree
       end
 
       it 'can control the page size through a parameter' do
-        FactoryGirl.create(:return_authorization, :order => order)
-        FactoryGirl.create(:return_authorization, :order => order)
-        api_get :index, :order_id => order.number, :per_page => 1
+        FactoryGirl.create(:return_authorization, order: order)
+        FactoryGirl.create(:return_authorization, order: order)
+        api_get :index, order_id: order.number, per_page: 1
         expect(json_response['count']).to eq(1)
         expect(json_response['current_page']).to eq(1)
         expect(json_response['pages']).to eq(2)
       end
 
       it 'can query the results through a paramter' do
-        FactoryGirl.create(:return_authorization, :order => order)
-        expected_result = create(:return_authorization, :memo => 'damaged')
+        FactoryGirl.create(:return_authorization, order: order)
+        expected_result = create(:return_authorization, memo: 'damaged')
         order.return_authorizations << expected_result
-        api_get :index, :q => { :memo_cont => 'damaged' }
+        api_get :index, q: { memo_cont: 'damaged' }
         expect(json_response['count']).to eq(1)
         expect(json_response['return_authorizations'].first['memo']).to eq expected_result.memo
       end
@@ -120,26 +120,26 @@ module Spree
       end
 
       it "can update a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, :order => order)
+        FactoryGirl.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
-        api_put :update, :id => return_authorization.id, :return_authorization => { :memo => "ABC" }
+        api_put :update, id: return_authorization.id, return_authorization: { memo: "ABC" }
         expect(response.status).to eq(200)
         expect(json_response).to have_attributes(attributes)
       end
 
       it "can cancel a return authorization on the order" do
-        FactoryGirl.create(:new_return_authorization, :order => order)
+        FactoryGirl.create(:new_return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         expect(return_authorization.state).to eq("authorized")
-        api_delete :cancel, :id => return_authorization.id
+        api_delete :cancel, id: return_authorization.id
         expect(response.status).to eq(200)
         expect(return_authorization.reload.state).to eq("canceled")
       end
 
       it "can delete a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, :order => order)
+        FactoryGirl.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
-        api_delete :destroy, :id => return_authorization.id
+        api_delete :destroy, id: return_authorization.id
         expect(response.status).to eq(204)
         expect { return_authorization.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
@@ -149,22 +149,22 @@ module Spree
 
     context "as just another user" do
       it "cannot add a return authorization to the order" do
-        api_post :create, :return_autorization => { :order_id => order.number, :memo => "Defective" }
+        api_post :create, return_autorization: { order_id: order.number, memo: "Defective" }
         assert_unauthorized!
       end
 
       it "cannot update a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, :order => order)
+        FactoryGirl.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
-        api_put :update, :id => return_authorization.id, :return_authorization => { :memo => "ABC" }
+        api_put :update, id: return_authorization.id, return_authorization: { memo: "ABC" }
         assert_unauthorized!
         expect(return_authorization.reload.memo).not_to eq("ABC")
       end
 
       it "cannot delete a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, :order => order)
+        FactoryGirl.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
-        api_delete :destroy, :id => return_authorization.id
+        api_delete :destroy, id: return_authorization.id
         assert_unauthorized!
         expect { return_authorization.reload }.not_to raise_error
       end

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Spree::Api::ShipmentsController, :type => :controller do
+describe Spree::Api::ShipmentsController, type: :controller do
   render_views
   let!(:shipment) { create(:shipment, address: create(:address), inventory_units: [build(:inventory_unit, shipment: nil)]) }
-  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_methods] }
+  let!(:attributes) { [:id, :tracking, :tracking_url, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_methods] }
 
   before do
     stub_authentication!
@@ -68,7 +68,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
           it 'should return proper error' do
             subject
             expect(response.status).to eq(422)
-            expect(json_response['exception']).to eq("param is missing or the value is empty: #{field.to_s}")
+            expect(json_response['exception']).to eq("param is missing or the value is empty: #{field}")
           end
         end
       end
@@ -92,7 +92,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
     end
 
     it "can make a shipment ready" do
-      allow_any_instance_of(Spree::Order).to receive_messages(:paid? => true, :complete? => true)
+      allow_any_instance_of(Spree::Order).to receive_messages(paid?: true, complete?: true)
       api_put :ready
       expect(json_response).to have_attributes(attributes)
       expect(json_response["state"]).to eq("ready")
@@ -100,7 +100,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
     end
 
     it "cannot make a shipment ready if the order is unpaid" do
-      allow_any_instance_of(Spree::Order).to receive_messages(:paid? => false)
+      allow_any_instance_of(Spree::Order).to receive_messages(paid?: false)
       api_put :ready
       expect(json_response["error"]).to eq("Cannot ready shipment.")
       expect(response.status).to eq(422)
@@ -149,7 +149,6 @@ describe Spree::Api::ShipmentsController, :type => :controller do
         expect(response.status).to eq(422)
         expect(json_response['errors']['base'].join).to match /Cannot remove items/
       end
-
     end
 
     describe '#mine' do
@@ -199,7 +198,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
         end
 
         context 'with filtering' do
-          let(:params) { {q: {order_completed_at_not_null: 1}} }
+          let(:params) { { q: { order_completed_at_not_null: 1 } } }
 
           let!(:incomplete_order) { create(:order_with_line_items, user: current_api_user) }
 
@@ -219,7 +218,6 @@ describe Spree::Api::ShipmentsController, :type => :controller do
         end
       end
     end
-
   end
 
   describe "#ship" do

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StatesController, :type => :controller do
+  describe Api::StatesController, type: :controller do
     render_views
 
-    let!(:state) { create(:state, :name => "Victoria") }
+    let!(:state) { create(:state, name: "Victoria") }
     let(:attributes) { [:id, :name, :abbr, :country_id] }
 
     before do
@@ -18,7 +18,7 @@ module Spree
     end
 
     it "gets all the states for a particular country" do
-      api_get :index, :country_id => state.country.id
+      api_get :index, country_id: state.country.id
       expect(json_response["states"].first).to have_attributes(attributes)
       expect(json_response['states'].first['name']).to eq(state.name)
     end
@@ -38,26 +38,25 @@ module Spree
       it "paginates when page parameter is passed through" do
         expect(@scope).to receive(:page).with(1).and_return(@scope)
         expect(@scope).to receive(:per).with(nil)
-        api_get :index, :page => 1
+        api_get :index, page: 1
       end
 
       it "paginates when per_page parameter is passed through" do
         expect(@scope).to receive(:page).with(nil).and_return(@scope)
         expect(@scope).to receive(:per).with(25)
-        api_get :index, :per_page => 25
+        api_get :index, per_page: 25
       end
     end
 
-
     context "with two states" do
-      before { create(:state, :name => "New South Wales") }
+      before { create(:state, name: "New South Wales") }
 
       it "gets all states for a country" do
-        country = create(:country, :states_required => true)
-        state.country = country 
+        country = create(:country, states_required: true)
+        state.country = country
         state.save
 
-        api_get :index, :country_id => country.id
+        api_get :index, country_id: country.id
         expect(json_response["states"].first).to have_attributes(attributes)
         expect(json_response["states"].count).to eq(1)
         json_response["states_required"] = true
@@ -69,13 +68,13 @@ module Spree
       end
 
       it 'can query the results through a paramter' do
-        api_get :index, :q => { :name_cont => 'Vic' }
+        api_get :index, q: { name_cont: 'Vic' }
         expect(json_response['states'].first['name']).to eq("Victoria")
       end
     end
 
     it "can view a state" do
-      api_get :show, :id => state.id
+      api_get :show, id: state.id
       expect(json_response).to have_attributes(attributes)
     end
   end

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

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockItemsController, :type => :controller do
+  describe Api::StockItemsController, type: :controller do
     render_views
 
     let!(:stock_location) { create(:stock_location_with_items) }
     let!(:stock_item) { stock_location.stock_items.order(:id).first }
-    let!(:attributes) { [:id, :count_on_hand, :backorderable,
-                         :stock_location_id, :variant_id] }
+    let!(:attributes) {
+      [:id, :count_on_hand, :backorderable,
+       :stock_location_id, :variant_id]
+    }
 
     before do
       stub_authentication!
@@ -210,9 +212,9 @@ module Spree
               expect(stock_item.should_track_inventory?).to eq true
             end
 
-             it "sets the stock item's count_on_hand" do
-              subject
-              expect(assigns(:stock_item).count_on_hand).to eq 50
+            it "sets the stock item's count_on_hand" do
+             subject
+             expect(assigns(:stock_item).count_on_hand).to eq 50
             end
           end
 
@@ -246,7 +248,8 @@ module Spree
               id: stock_item.to_param,
               stock_item: {
                 count_on_hand: count_on_hand,
-                force: true,
+                backorderable: true,
+                force: true
               }
             }
           end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockLocationsController, :type => :controller do
+  describe Api::StockLocationsController, type: :controller do
     render_views
 
     let!(:stock_location) { create(:stock_location) }
@@ -59,14 +59,14 @@ module Spree
 
       describe "#update" do
         it "cannot update a stock location" do
-          api_put :update, :stock_location => { :name => "South Pole" }, :id => stock_location.to_param
+          api_put :update, stock_location: { name: "South Pole" }, id: stock_location.to_param
           expect(response.status).to eq(401)
         end
       end
 
       describe "#destroy" do
         it "cannot delete a stock location" do
-          api_put :destroy, :id => stock_location.to_param
+          api_put :destroy, id: stock_location.to_param
           expect(response.status).to eq(401)
         end
       end
@@ -112,7 +112,6 @@ module Spree
           expect(json_response['count']).to eq(1)
           expect(json_response['stock_locations'].first['name']).to eq expected_result.name
         end
-
       end
 
       describe "#show" do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockMovementsController, :type => :controller do
+  describe Api::StockMovementsController, type: :controller do
     render_views
 
     let!(:stock_location) { create(:stock_location_with_items) }
@@ -55,7 +55,7 @@ module Spree
       end
 
       it 'can query the results through a paramter' do
-        expected_result = create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
+        create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
         api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
         expect(json_response['count']).to eq(1)
       end
@@ -81,4 +81,3 @@ module Spree
     end
   end
 end
-

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

@@ -11,7 +11,6 @@ describe Spree::Api::StoreCreditEventsController, type: :controller do
   end
 
   describe "GET mine" do
-
     subject { api_get :mine, { format: :json } }
 
     before { allow(controller).to receive_messages(current_api_user: current_api_user) }
@@ -65,4 +64,3 @@ describe Spree::Api::StoreCreditEventsController, type: :controller do
     end
   end
 end
-

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

@@ -96,7 +96,7 @@ module Spree
           api_delete :destroy, id: store.id
           expect(response.status).to eq(422)
           expect(json_response["errors"]["base"]).to eql(
-          ["Cannot destroy the default Store."]
+            ["Cannot destroy the default Store."]
           )
         end
 
@@ -108,7 +108,6 @@ module Spree
     end
 
     context "as an user" do
-
       it "I cannot list all the stores" do
         api_get :index
         expect(response.status).to eq(401)

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

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::TaxonomiesController, :type => :controller do
+  describe Api::TaxonomiesController, type: :controller do
     render_views
 
     let(:taxonomy) { create(:taxonomy) }
-    let(:taxon) { create(:taxon, :name => "Ruby", :taxonomy => taxonomy) }
-    let(:taxon2) { create(:taxon, :name => "Rails", :taxonomy => taxonomy) }
+    let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
+    let(:taxon2) { create(:taxon, name: "Rails", taxonomy: taxonomy) }
     let(:attributes) { [:id, :name] }
 
     before do
       stub_authentication!
-      taxon2.children << create(:taxon, :name => "3.2.2", :taxonomy => taxonomy)
+      taxon2.children << create(:taxon, name: "3.2.2", taxonomy: taxonomy)
       taxon.children << taxon2
       taxonomy.root.children << taxon
     end
@@ -26,21 +26,21 @@ module Spree
 
       it 'can control the page size through a parameter' do
         create(:taxonomy)
-        api_get :index, :per_page => 1
+        api_get :index, per_page: 1
         expect(json_response['count']).to eq(1)
         expect(json_response['current_page']).to eq(1)
         expect(json_response['pages']).to eq(2)
       end
 
       it 'can query the results through a paramter' do
-        expected_result = create(:taxonomy, :name => 'Style')
-        api_get :index, :q => { :name_cont => 'style' }
+        expected_result = create(:taxonomy, name: 'Style')
+        api_get :index, q: { name_cont: 'style' }
         expect(json_response['count']).to eq(1)
         expect(json_response['taxonomies'].first['name']).to eq expected_result.name
       end
 
       it "gets a single taxonomy" do
-        api_get :show, :id => taxonomy.id
+        api_get :show, id: taxonomy.id
 
         expect(json_response['name']).to eq taxonomy.name
 
@@ -51,7 +51,7 @@ module Spree
       end
 
       it "gets a single taxonomy with set=nested" do
-        api_get :show, :id => taxonomy.id, :set => 'nested'
+        api_get :show, id: taxonomy.id, set: 'nested'
 
         expect(json_response['name']).to eq taxonomy.name
 
@@ -60,9 +60,9 @@ module Spree
       end
 
       it "gets the jstree-friendly version of a taxonomy" do
-        api_get :jstree, :id => taxonomy.id
+        api_get :jstree, id: taxonomy.id
         expect(json_response["data"]).to eq(taxonomy.root.name)
-        expect(json_response["attr"]).to eq({ "id" => taxonomy.root.id, "name" => taxonomy.root.name})
+        expect(json_response["attr"]).to eq({ "id" => taxonomy.root.id, "name" => taxonomy.root.name })
         expect(json_response["state"]).to eq("closed")
       end
 
@@ -74,17 +74,17 @@ module Spree
       end
 
       it "cannot create a new taxonomy if not an admin" do
-        api_post :create, :taxonomy => { :name => "Location" }
+        api_post :create, taxonomy: { name: "Location" }
         assert_unauthorized!
       end
 
       it "cannot update a taxonomy" do
-        api_put :update, :id => taxonomy.id, :taxonomy => { :name => "I hacked your store!" }
+        api_put :update, id: taxonomy.id, taxonomy: { name: "I hacked your store!" }
         assert_unauthorized!
       end
 
       it "cannot delete a taxonomy" do
-        api_delete :destroy, :id => taxonomy.id
+        api_delete :destroy, id: taxonomy.id
         assert_unauthorized!
       end
     end
@@ -93,20 +93,19 @@ module Spree
       sign_in_as_admin!
 
       it "can create" do
-        api_post :create, :taxonomy => { :name => "Colors"}
+        api_post :create, taxonomy: { name: "Colors" }
         expect(json_response).to have_attributes(attributes)
         expect(response.status).to eq(201)
       end
 
       it "cannot create a new taxonomy with invalid attributes" do
-        api_post :create, :taxonomy => {}
+        api_post :create, taxonomy: {}
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
-        errors = json_response["errors"]
       end
 
       it "can destroy" do
-        api_delete :destroy, :id => taxonomy.id
+        api_delete :destroy, id: taxonomy.id
         expect(response.status).to eq(204)
       end
     end