solidus_api 2.2.2 → 2.3.0.beta1

data/spec/{controllers → requests}/spree/api/states_controller_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StatesController, type: :controller do
-    render_views
+  describe Api::StatesController, type: :request do
 
     let!(:state) { create(:state, name: "Victoria") }
     let(:attributes) { [:id, :name, :abbr, :country_id] }
@@ -12,13 +11,13 @@ module Spree
     end
 
     it "gets all states" do
-      api_get :index
+      get spree.api_states_path
       expect(json_response["states"].first).to have_attributes(attributes)
       expect(json_response['states'].first['name']).to eq(state.name)
     end
 
     it "gets all the states for a particular country" do
-      api_get :index, country_id: state.country.id
+      get spree.api_country_states_path(state.country)
       expect(json_response["states"].first).to have_attributes(attributes)
       expect(json_response['states'].first['name']).to eq(state.name)
     end
@@ -26,7 +25,7 @@ module Spree
     context "pagination" do
       it "can select the next page and control page size" do
         create(:state)
-        api_get :index, page: 2, per_page: 1
+        get spree.api_states_path, params: { page: 2, per_page: 1 }
 
         expect(json_response["states"].size).to eq(1)
         expect(json_response["pages"]).to eq(2)
@@ -43,25 +42,25 @@ module Spree
         state.country = country
         state.save
 
-        api_get :index, country_id: country.id
+        get spree.api_country_states_path(country)
         expect(json_response["states"].first).to have_attributes(attributes)
         expect(json_response["states"].count).to eq(1)
         json_response["states_required"] = true
       end
 
       it "can view all states" do
-        api_get :index
+        get spree.api_states_path
         expect(json_response["states"].first).to have_attributes(attributes)
       end
 
       it 'can query the results through a paramter' do
-        api_get :index, q: { name_cont: 'Vic' }
+        get spree.api_states_path, params: { 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
+      get spree.api_state_path(state)
       expect(json_response).to have_attributes(attributes)
     end
   end

data/spec/{controllers → requests}/spree/api/stock_items_controller_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockItemsController, type: :controller do
-    render_views
+  describe Api::StockItemsController, type: :request do
 
     let!(:stock_location) { create(:stock_location_with_items) }
     let!(:stock_item) { stock_location.stock_items.order(:id).first }
@@ -18,7 +17,7 @@ module Spree
     context "as a normal user" do
       describe "#index" do
         it "can list stock items for an active stock location" do
-          api_get :index, stock_location_id: stock_location.to_param
+          get spree.api_stock_location_stock_items_path(stock_location)
           expect(response).to be_success
           expect(json_response['stock_items'].first).to have_attributes(attributes)
           expect(json_response['stock_items'].first['variant']['sku']).to match /\ASKU-\d+\z/
@@ -26,21 +25,21 @@ module Spree
 
         it "cannot list stock items for an inactive stock location" do
           stock_location.update_attributes!(active: false)
-          api_get :index, stock_location_id: stock_location.to_param
+          get spree.api_stock_location_stock_items_path(stock_location)
           expect(response).to be_not_found
         end
       end
 
       describe "#show" do
         it "can see a stock item for an active stock location" do
-          api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
+          get spree.api_stock_location_stock_item_path(stock_location, stock_item)
           expect(json_response).to have_attributes(attributes)
           expect(json_response['count_on_hand']).to eq stock_item.count_on_hand
         end
 
         it "cannot see a stock item for an inactive stock location" do
           stock_location.update_attributes!(active: false)
-          api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
+          get spree.api_stock_location_stock_item_path(stock_location, stock_item)
           expect(response.status).to eq(404)
         end
       end
@@ -49,28 +48,27 @@ module Spree
         it "cannot create a stock item" do
           variant = create(:variant)
           params = {
-            stock_location_id: stock_location.to_param,
             stock_item: {
               variant_id: variant.id,
               count_on_hand: '20'
             }
           }
 
-          api_post :create, params
+          post spree.api_stock_location_stock_items_path(stock_location), params: params
           expect(response.status).to eq(401)
         end
       end
 
       describe "#update" do
         it "cannot update a stock item" do
-          api_put :update, stock_location_id: stock_location.to_param, id: stock_item.to_param
+          put spree.api_stock_location_stock_item_path(stock_location, stock_item)
           expect(response.status).to eq(404)
         end
       end
 
       describe "#destroy" do
         it "cannot destroy a stock item" do
-          api_delete :destroy, stock_location_id: stock_location.to_param, id: stock_item.to_param
+          delete spree.api_stock_location_stock_item_path(stock_location, stock_item)
           expect(response.status).to eq(404)
         end
       end
@@ -79,33 +77,33 @@ module Spree
     context "as an admin" do
       sign_in_as_admin!
 
-      it 'cannot list of stock items' do
-        api_get :index, stock_location_id: stock_location.to_param
+      it 'can list stock items' do
+        get spree.api_stock_location_stock_items_path(stock_location)
         expect(json_response['stock_items'].first).to have_attributes(attributes)
         expect(json_response['stock_items'].first['variant']['sku']).to include 'SKU'
       end
 
       it 'requires a stock_location_id to be passed as a parameter' do
-        api_get :index
+        get spree.api_stock_items_path
         expect(json_response['exception']).to eq('param is missing or the value is empty: stock_location_id')
         expect(response.status).to eq(422)
       end
 
       it 'can control the page size through a parameter' do
-        api_get :index, stock_location_id: stock_location.to_param, per_page: 1
+        get spree.api_stock_location_stock_items_path(stock_location), params: { per_page: 1 }
         expect(json_response['count']).to eq(1)
         expect(json_response['current_page']).to eq(1)
       end
 
       it 'can query the results through a paramter' do
         stock_item.update_column(:count_on_hand, 30)
-        api_get :index, stock_location_id: stock_location.to_param, q: { count_on_hand_eq: '30' }
+        get spree.api_stock_location_stock_items_path(stock_location), params: { q: { count_on_hand_eq: '30' } }
         expect(json_response['count']).to eq(1)
         expect(json_response['stock_items'].first['count_on_hand']).to eq 30
       end
 
       it 'gets a stock item' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
+        get spree.api_stock_location_stock_item_path(stock_location, stock_item)
         expect(json_response).to have_attributes(attributes)
         expect(json_response['count_on_hand']).to eq stock_item.count_on_hand
       end
@@ -121,7 +119,6 @@ module Spree
         let(:count_on_hand) { '20' }
         let(:params) do
           {
-            stock_location_id: stock_location.to_param,
             stock_item: {
               variant_id: variant.id,
               count_on_hand: count_on_hand
@@ -129,7 +126,9 @@ module Spree
           }
         end
 
-        subject { api_post :create, params }
+        subject do
+          post spree.api_stock_location_stock_items_path(stock_location), params: params
+        end
 
         it 'can create a new stock item' do
           subject
@@ -181,13 +180,14 @@ module Spree
           expect(stock_item.count_on_hand).to eq 10
         end
 
-        subject { api_put :update, params }
+        subject do
+          put spree.api_stock_item_path(stock_item), params: params
+        end
 
         context 'adjusting count_on_hand' do
           let(:count_on_hand) { 40 }
           let(:params) do
             {
-              id: stock_item.to_param,
               stock_item: {
                 count_on_hand: count_on_hand,
                 backorderable: true
@@ -301,7 +301,7 @@ module Spree
       end
 
       it 'can delete a stock item' do
-        api_delete :destroy, id: stock_item.to_param
+        delete spree.api_stock_item_path(stock_item)
         expect(response.status).to eq(204)
         expect { Spree::StockItem.find(stock_item.id) }.to raise_error(ActiveRecord::RecordNotFound)
       end

data/spec/{controllers → requests}/spree/api/stock_locations_controller_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockLocationsController, type: :controller do
-    render_views
+  describe Api::StockLocationsController, type: :request do
 
     let!(:stock_location) { create(:stock_location) }
     let!(:attributes) { [:id, :name, :address1, :address2, :city, :state_id, :state_name, :country_id, :zipcode, :phone, :active] }
@@ -14,7 +13,7 @@ module Spree
     context "as a user" do
       describe "#index" do
         it "can see active stock locations" do
-          api_get :index
+          get spree.api_stock_locations_path
           expect(response).to be_success
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
@@ -22,7 +21,7 @@ module Spree
 
         it "cannot see inactive stock locations" do
           stock_location.update_attributes!(active: false)
-          api_get :index
+          get spree.api_stock_locations_path
           expect(response).to be_success
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).not_to include stock_location.name
@@ -31,14 +30,14 @@ module Spree
 
       describe "#show" do
         it "can see active stock locations" do
-          api_get :show, id: stock_location.id
+          get spree.api_stock_location_path(stock_location)
           expect(response).to be_success
           expect(json_response['name']).to eq stock_location.name
         end
 
         it "cannot see inactive stock locations" do
           stock_location.update_attributes!(active: false)
-          api_get :show, id: stock_location.id
+          get spree.api_stock_location_path(stock_location)
           expect(response).to be_not_found
         end
       end
@@ -52,21 +51,21 @@ module Spree
             }
           }
 
-          api_post :create, params
+          post spree.api_stock_locations_path, params: params
           expect(response.status).to eq(401)
         end
       end
 
       describe "#update" do
         it "cannot update a stock location" do
-          api_put :update, stock_location: { name: "South Pole" }, id: stock_location.to_param
+          put spree.api_stock_location_path(stock_location), params: { stock_location: { name: "South Pole" } }
           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
+          delete spree.api_stock_location_path(stock_location)
           expect(response.status).to eq(401)
         end
       end
@@ -77,7 +76,7 @@ module Spree
 
       describe "#index" do
         it "can see active stock locations" do
-          api_get :index
+          get spree.api_stock_locations_path
           expect(response).to be_success
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
@@ -85,14 +84,14 @@ module Spree
 
         it "can see inactive stock locations" do
           stock_location.update_attributes!(active: false)
-          api_get :index
+          get spree.api_stock_locations_path
           expect(response).to be_success
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
         end
 
         it "gets stock location information" do
-          api_get :index
+          get spree.api_stock_locations_path
           expect(json_response['stock_locations'].first).to have_attributes(attributes)
           expect(json_response['stock_locations'].first['country']).not_to be_nil
           expect(json_response['stock_locations'].first['state']).not_to be_nil
@@ -100,7 +99,7 @@ module Spree
 
         it 'can control the page size through a parameter' do
           create(:stock_location)
-          api_get :index, per_page: 1
+          get spree.api_stock_locations_path, params: { 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)
@@ -108,7 +107,7 @@ module Spree
 
         it 'can query the results through a paramter' do
           expected_result = create(:stock_location, name: 'South America')
-          api_get :index, q: { name_cont: 'south' }
+          get spree.api_stock_locations_path, params: { q: { name_cont: 'south' } }
           expect(json_response['count']).to eq(1)
           expect(json_response['stock_locations'].first['name']).to eq expected_result.name
         end
@@ -116,14 +115,14 @@ module Spree
 
       describe "#show" do
         it "can see active stock locations" do
-          api_get :show, id: stock_location.id
+          get spree.api_stock_location_path(stock_location)
           expect(response).to be_success
           expect(json_response['name']).to eq stock_location.name
         end
 
         it "can see inactive stock locations" do
           stock_location.update_attributes!(active: false)
-          api_get :show, id: stock_location.id
+          get spree.api_stock_location_path(stock_location)
           expect(response).to be_success
           expect(json_response['name']).to eq stock_location.name
         end
@@ -138,7 +137,7 @@ module Spree
             }
           }
 
-          api_post :create, params
+          post spree.api_stock_locations_path, params: params
           expect(response.status).to eq(201)
           expect(json_response).to have_attributes(attributes)
         end
@@ -147,13 +146,12 @@ module Spree
       describe "#update" do
         it "can update a stock location" do
           params = {
-            id: stock_location.to_param,
             stock_location: {
               name: "South Pole"
             }
           }
 
-          api_put :update, params
+          put spree.api_stock_location_path(stock_location), params: params
           expect(response.status).to eq(200)
           expect(json_response['name']).to eq 'South Pole'
         end
@@ -161,7 +159,7 @@ module Spree
 
       describe "#destroy" do
         it "can delete a stock location" do
-          api_delete :destroy, id: stock_location.to_param
+          delete spree.api_stock_location_path(stock_location)
           expect(response.status).to eq(204)
           expect { stock_location.reload }.to raise_error(ActiveRecord::RecordNotFound)
         end

data/spec/{controllers → requests}/spree/api/stock_movements_controller_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::StockMovementsController, type: :controller do
-    render_views
+  describe Api::StockMovementsController, type: :request do
 
     let!(:stock_location) { create(:stock_location_with_items) }
     let!(:stock_item) { stock_location.stock_items.order(:id).first }
@@ -15,24 +14,23 @@ module Spree
 
     context 'as a user' do
       it 'cannot see a list of stock movements' do
-        api_get :index, stock_location_id: stock_location.to_param
+        get spree.api_stock_location_stock_movements_path(stock_location)
         expect(response.status).to eq(401)
       end
 
       it 'cannot see a stock movement' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.id
+        get spree.api_stock_location_stock_movement_path(stock_location, stock_movement)
         expect(response.status).to eq(404)
       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
           }
         }
 
-        api_post :create, params
+        post spree.api_stock_location_stock_movements_path(stock_location), params: params
         expect(response.status).to eq(401)
       end
     end
@@ -41,14 +39,14 @@ module Spree
       sign_in_as_admin!
 
       it 'gets list of stock movements' do
-        api_get :index, stock_location_id: stock_location.to_param
+        get spree.api_stock_location_stock_movements_path(stock_location)
         expect(json_response['stock_movements'].first).to have_attributes(attributes)
         expect(json_response['stock_movements'].first['stock_item']['count_on_hand']).to eq 11
       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
+        get spree.api_stock_location_stock_movements_path(stock_location), params: { 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)
@@ -56,25 +54,24 @@ module Spree
 
       it 'can query the results through a paramter' do
         create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
-        api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
+        get spree.api_stock_location_stock_movements_path(stock_location), params: { q: { quantity_eq: '10' } }
         expect(json_response['count']).to eq(1)
       end
 
       it 'gets a stock movement' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.to_param
+        get spree.api_stock_location_stock_movement_path(stock_location, stock_movement)
         expect(json_response).to have_attributes(attributes)
         expect(json_response['stock_item_id']).to eq stock_movement.stock_item_id
       end
 
       it 'can create a new stock movement' do
         params = {
-          stock_location_id: stock_location.to_param,
           stock_movement: {
             stock_item_id: stock_item.to_param
           }
         }
 
-        api_post :create, params
+        post spree.api_stock_location_stock_movements_path(stock_location), params: params
         expect(response.status).to eq(201)
         expect(json_response).to have_attributes(attributes)
       end