solidus_api 2.2.2 → 2.3.0.beta1

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

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Spree
   describe Api::StockTransfersController do
-    render_views
 
     let!(:stock_transfer) { create(:stock_transfer_with_items) }
     let(:transfer_item)   { stock_transfer.transfer_items.first }
@@ -14,7 +13,7 @@ module Spree
     context "as a normal user" do
       describe "#receive" do
         it "cannot receive transfer items from a stock transfer" do
-          api_post :receive, id: stock_transfer.to_param, variant_id: transfer_item.variant.to_param
+          post spree.receive_api_stock_transfer_path(stock_transfer), params: { variant_id: transfer_item.variant }
           expect(response.status).to eq 401
         end
       end
@@ -25,7 +24,7 @@ module Spree
 
       describe "#receive" do
         subject do
-          api_post :receive, id: stock_transfer.to_param, variant_id: variant_id
+          post spree.receive_api_stock_transfer_path(stock_transfer), params: { variant_id: variant_id }
         end
 
         context "valid parameters" do

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

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Spree::Api::StoreCreditEventsController, type: :request do
+  let(:api_user) { create(:user, :with_api_key) }
+
+  describe "GET mine" do
+    subject do
+      get spree.mine_api_store_credit_events_path(format: :json), headers: { 'X-Spree-Token' => api_key }
+    end
+
+    context "no current api user" do
+      let(:api_key) { nil }
+
+      before { subject }
+
+      it "returns a 401" do
+        expect(response.status).to eq 401
+      end
+    end
+
+    context "the current api user is authenticated" do
+      let(:current_api_user) { create(:user, :with_api_key) }
+      let(:api_key) { current_api_user.spree_api_key }
+
+      context "the user doesn't have store credit" do
+        before { subject }
+
+        it "should set the events variable to empty list" do
+          expect(json_response["store_credit_events"]).to eq []
+        end
+
+        it "returns a 200" do
+          expect(response.status).to eq 200
+        end
+      end
+
+      context "the user has store credit" do
+        let!(:store_credit) { create(:store_credit, user: current_api_user) }
+
+        before { subject }
+
+        it "should contain the store credit allocation event" do
+          expect(json_response["store_credit_events"].size).to eq 1
+          expect(json_response["store_credit_events"][0]).to include(
+            "display_amount" => "$150.00",
+            "display_user_total_amount" => "$150.00",
+            "display_action" => "Added"
+          )
+        end
+
+        it "returns a 200" do
+          expect(response.status).to eq 200
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,7 @@
 require "spec_helper"
 
 module Spree
-  describe Api::StoresController, type: :controller do
-    render_views
+  describe Api::StoresController, type: :request do
 
     let!(:store) do
       create(:store, name: "My Spree Store", url: "spreestore.example.com")
@@ -23,8 +22,8 @@ module Spree
         )
       end
 
-      it "I can list the available stores" do
-        api_get :index
+      it "can list the available stores" do
+        get spree.api_stores_path
         expect(json_response["stores"]).to match_array([
           {
             "id" => store.id,
@@ -53,8 +52,8 @@ module Spree
         ])
       end
 
-      it "I can get the store details" do
-        api_get :show, id: store.id
+      it "can get the store details" do
+        get spree.api_store_path(store)
         expect(json_response).to eq(
           "id" => store.id,
           "name" => "My Spree Store",
@@ -69,23 +68,23 @@ module Spree
         )
       end
 
-      it "I can create a new store" do
+      it "can create a new store" do
         store_hash = {
           code: "spree123",
           name: "Hack0rz",
           url: "spree123.example.com",
           mail_from_address: "me@example.com"
         }
-        api_post :create, store: store_hash
+        post spree.api_stores_path, params: { store: store_hash }
         expect(response.status).to eq(201)
       end
 
-      it "I can update an existing store" do
+      it "can update an existing store" do
         store_hash = {
           url: "spree123.example.com",
           mail_from_address: "me@example.com"
         }
-        api_put :update, id: store.id, store: store_hash
+        put spree.api_store_path(store), params: { store: store_hash }
         expect(response.status).to eq(200)
         expect(store.reload.url).to eql "spree123.example.com"
         expect(store.reload.mail_from_address).to eql "me@example.com"
@@ -93,7 +92,7 @@ module Spree
 
       context "deleting a store" do
         it "will fail if it's the default Store" do
-          api_delete :destroy, id: store.id
+          delete spree.api_store_path(store)
           expect(response.status).to eq(422)
           expect(json_response["errors"]["base"]).to eql(
             ["Cannot destroy the default Store."]
@@ -101,30 +100,30 @@ module Spree
         end
 
         it "will destroy the store" do
-          api_delete :destroy, id: non_default_store.id
+          delete spree.api_store_path(non_default_store)
           expect(response.status).to eq(204)
         end
       end
     end
 
     context "as an user" do
-      it "I cannot list all the stores" do
-        api_get :index
+      it "cannot list all the stores" do
+        get spree.api_stores_path
         expect(response.status).to eq(401)
       end
 
-      it "I cannot get the store details" do
-        api_get :show, id: store.id
+      it "cannot get the store details" do
+        get spree.api_store_path(store)
         expect(response.status).to eq(401)
       end
 
-      it "I cannot create a new store" do
-        api_post :create, store: {}
+      it "cannot create a new store" do
+        post spree.api_stores_path, params: { store: {} }
         expect(response.status).to eq(401)
       end
 
-      it "I cannot update an existing store" do
-        api_put :update, id: store.id, store: {}
+      it "cannot update an existing store" do
+        put spree.api_store_path(store), params: { store: {} }
         expect(response.status).to eq(401)
       end
     end

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

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::TaxonomiesController, type: :controller do
-    render_views
+  describe Api::TaxonomiesController, type: :request do
 
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
@@ -18,7 +17,7 @@ module Spree
 
     context "as a normal user" do
       it "gets all taxonomies" do
-        api_get :index
+        get spree.api_taxonomies_path
 
         expect(json_response["taxonomies"].first['name']).to eq taxonomy.name
         expect(json_response["taxonomies"].first['root']['taxons'].count).to eq 1
@@ -26,7 +25,7 @@ module Spree
 
       it 'can control the page size through a parameter' do
         create(:taxonomy)
-        api_get :index, per_page: 1
+        get spree.api_taxonomies_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)
@@ -34,13 +33,13 @@ module Spree
 
       it 'can query the results through a paramter' do
         expected_result = create(:taxonomy, name: 'Style')
-        api_get :index, q: { name_cont: 'style' }
+        get spree.api_taxonomies_path, params: { 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
+        get spree.api_taxonomy_path(taxonomy.id)
 
         expect(json_response['name']).to eq taxonomy.name
 
@@ -51,7 +50,7 @@ module Spree
       end
 
       it "gets a single taxonomy with set=nested" do
-        api_get :show, id: taxonomy.id, set: 'nested'
+        get spree.api_taxonomy_path(taxonomy.id), params: { set: 'nested' }
 
         expect(json_response['name']).to eq taxonomy.name
 
@@ -60,31 +59,31 @@ module Spree
       end
 
       it "gets the jstree-friendly version of a taxonomy" do
-        api_get :jstree, id: taxonomy.id
+        get spree.jstree_api_taxonomy_path(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["state"]).to eq("closed")
       end
 
       it "can learn how to create a new taxonomy" do
-        api_get :new
+        get spree.new_api_taxonomy_path(taxonomy.id)
         expect(json_response["attributes"]).to eq(attributes.map(&:to_s))
         required_attributes = json_response["required_attributes"]
         expect(required_attributes).to include("name")
       end
 
       it "cannot create a new taxonomy if not an admin" do
-        api_post :create, taxonomy: { name: "Location" }
+        post spree.api_taxonomies_path, params: { taxonomy: { name: "Location" } }
         assert_unauthorized!
       end
 
       it "cannot update a taxonomy" do
-        api_put :update, id: taxonomy.id, taxonomy: { name: "I hacked your store!" }
+        put spree.api_taxonomy_path(taxonomy.id), params: { taxonomy: { name: "I hacked your store!" } }
         assert_unauthorized!
       end
 
       it "cannot delete a taxonomy" do
-        api_delete :destroy, id: taxonomy.id
+        delete spree.api_taxonomy_path(taxonomy.id)
         assert_unauthorized!
       end
     end
@@ -93,19 +92,19 @@ module Spree
       sign_in_as_admin!
 
       it "can create" do
-        api_post :create, taxonomy: { name: "Colors" }
+        post spree.api_taxonomies_path, params: { 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: {}
+        post spree.api_taxonomies_path, params: { taxonomy: {} }
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
       end
 
       it "can destroy" do
-        api_delete :destroy, id: taxonomy.id
+        delete spree.api_taxonomy_path(taxonomy.id)
         expect(response.status).to eq(204)
       end
     end

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

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::TaxonsController, type: :controller do
-    render_views
+  describe Api::TaxonsController, type: :request do
 
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
@@ -18,7 +17,7 @@ module Spree
 
     context "as a normal user" do
       it "gets all taxons for a taxonomy" do
-        api_get :index, taxonomy_id: taxonomy.id
+        get spree.api_taxonomy_taxons_path(taxonomy)
 
         expect(json_response['taxons'].first['name']).to eq taxon.name
         children = json_response['taxons'].first['taxons']
@@ -29,7 +28,7 @@ module Spree
 
       # Regression test for https://github.com/spree/spree/issues/4112
       it "does not include children when asked not to" do
-        api_get :index, taxonomy_id: taxonomy.id, without_children: 1
+        get spree.api_taxonomy_taxons_path(taxonomy), params: { without_children: 1 }
 
         expect(json_response['taxons'].first['name']).to eq(taxon.name)
         expect(json_response['taxons'].first['taxons']).to be_nil
@@ -39,7 +38,7 @@ module Spree
         new_taxon = create(:taxon, name: "Go", taxonomy: taxonomy)
         taxonomy.root.children << new_taxon
         expect(taxonomy.root.children.count).to eql(2)
-        api_get :index, taxonomy_id: taxonomy.id, page: 1, per_page: 1
+        get spree.api_taxonomy_taxons_path(taxonomy), params: { page: 1, per_page: 1 }
         expect(json_response["count"]).to eql(1)
         expect(json_response["total_count"]).to eql(2)
         expect(json_response["current_page"]).to eql(1)
@@ -50,7 +49,7 @@ module Spree
       describe 'searching' do
         context 'with a name' do
           before do
-            api_get :index, q: { name_cont: name }
+            get spree.api_taxons_path, params: { q: { name_cont: name } }
           end
 
           context 'with one result' do
@@ -74,7 +73,7 @@ module Spree
 
         context 'with no filters' do
           it "gets all taxons" do
-            api_get :index
+            get spree.api_taxons_path
 
             expect(json_response['taxons'].first['name']).to eq taxonomy.root.name
             children = json_response['taxons'].first['taxons']
@@ -86,14 +85,14 @@ module Spree
       end
 
       it "gets a single taxon" do
-        api_get :show, id: taxon.id, taxonomy_id: taxonomy.id
+        get spree.api_taxonomy_taxon_path(taxonomy, taxon.id)
 
         expect(json_response['name']).to eq taxon.name
         expect(json_response['taxons'].count).to eq 1
       end
 
       it "gets all taxons in JSTree form" do
-        api_get :jstree, taxonomy_id: taxonomy.id, id: taxon.id
+        get spree.jstree_api_taxonomy_taxon_path(taxonomy, taxon.id)
         response = json_response.first
         expect(response["data"]).to eq(taxon2.name)
         expect(response["attr"]).to eq({ "name" => taxon2.name, "id" => taxon2.id })
@@ -101,24 +100,24 @@ module Spree
       end
 
       it "can learn how to create a new taxon" do
-        api_get :new, taxonomy_id: taxonomy.id
+        get spree.new_api_taxonomy_taxon_path(taxonomy)
         expect(json_response["attributes"]).to eq(attributes.map(&:to_s))
         required_attributes = json_response["required_attributes"]
         expect(required_attributes).to include("name")
       end
 
       it "cannot create a new taxon if not an admin" do
-        api_post :create, taxonomy_id: taxonomy.id, taxon: { name: "Location" }
+        post spree.api_taxonomy_taxons_path(taxonomy), params: { taxon: { name: "Location" } }
         assert_unauthorized!
       end
 
       it "cannot update a taxon" do
-        api_put :update, taxonomy_id: taxonomy.id, id: taxon.id, taxon: { name: "I hacked your store!" }
+        put spree.api_taxonomy_taxon_path(taxonomy, taxon.id), params: { taxon: { name: "I hacked your store!" } }
         assert_unauthorized!
       end
 
       it "cannot delete a taxon" do
-        api_delete :destroy, taxonomy_id: taxonomy.id, id: taxon.id
+        delete spree.api_taxonomy_taxon_path(taxonomy, taxon.id)
         assert_unauthorized!
       end
     end
@@ -127,7 +126,7 @@ module Spree
       sign_in_as_admin!
 
       it "can create" do
-        api_post :create, taxonomy_id: taxonomy.id, taxon: { name: "Colors" }
+        post spree.api_taxonomy_taxons_path(taxonomy), params: { taxon: { name: "Colors" } }
         expect(json_response).to have_attributes(attributes)
         expect(response.status).to eq(201)
 
@@ -140,14 +139,14 @@ module Spree
 
       it "can update the position in the list" do
         taxonomy.root.children << taxon2
-        api_put :update, taxonomy_id: taxonomy.id, id: taxon.id, taxon: { parent_id: taxon.parent_id, child_index: 2 }
+        put spree.api_taxonomy_taxon_path(taxonomy, taxon.id), params: { taxon: { parent_id: taxon.parent_id, child_index: 2 } }
         expect(response.status).to eq(200)
         expect(taxonomy.reload.root.children[0]).to eql taxon2
         expect(taxonomy.reload.root.children[1]).to eql taxon
       end
 
       it "cannot create a new taxon with invalid attributes" do
-        api_post :create, taxonomy_id: taxonomy.id, taxon: { foo: :bar }
+        post spree.api_taxonomy_taxons_path(taxonomy), params: { taxon: { foo: :bar } }
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
 
@@ -155,7 +154,7 @@ module Spree
       end
 
       it "cannot create a new taxon with invalid taxonomy_id" do
-        api_post :create, taxonomy_id: 1000, taxon: { name: "Colors" }
+        post spree.api_taxonomy_taxons_path(1000), params: { taxon: { name: "Colors" } }
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
 
@@ -167,7 +166,7 @@ module Spree
       end
 
       it "can destroy" do
-        api_delete :destroy, taxonomy_id: taxonomy.id, id: taxon.id
+        delete spree.api_taxonomy_taxon_path(taxonomy, taxon.id)
         expect(response.status).to eq(204)
       end
     end

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

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Spree
   describe Api::TransferItemsController do
-    render_views
 
     let!(:stock_transfer) { create(:stock_transfer_with_items) }
     let(:transfer_item)   { stock_transfer.transfer_items.first }
@@ -14,21 +13,21 @@ module Spree
     context "as a normal user" do
       describe "#create" do
         it "cannot create a transfer item" do
-          api_post :create, stock_transfer_id: stock_transfer.to_param
+          post spree.api_stock_transfer_transfer_items_path(stock_transfer)
           expect(response.status).to eq 401
         end
       end
 
       describe "#update" do
         it "cannot update a transfer item" do
-          api_put :update, stock_transfer_id: stock_transfer.to_param, id: transfer_item.to_param
+          put spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item)
           expect(response.status).to eq 401
         end
       end
 
       describe "#destroy" do
         it "cannot delete a transfer item" do
-          api_delete :destroy, stock_transfer_id: stock_transfer.to_param, id: transfer_item.to_param
+          delete spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item)
           expect(response.status).to eq 401
         end
       end
@@ -40,13 +39,12 @@ module Spree
       describe "#create" do
         subject do
           create_params = {
-            stock_transfer_id: stock_transfer.to_param,
             transfer_item: {
               variant_id: variant_id,
               expected_quantity: 1
             }
           }
-          api_post :create, create_params
+          post spree.api_stock_transfer_transfer_items_path(stock_transfer), params: create_params
         end
 
         context "valid parameters" do
@@ -87,8 +85,8 @@ module Spree
 
       describe "#update" do
         subject do
-          update_params = { id: transfer_item.to_param, stock_transfer_id: stock_transfer.to_param, transfer_item: { received_quantity: received_quantity } }
-          api_put :update, update_params
+          update_params = { transfer_item: { received_quantity: received_quantity } }
+          put spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item), params: update_params
         end
 
         context "valid parameters" do
@@ -119,7 +117,7 @@ module Spree
       end
 
       describe "#destroy" do
-        subject { api_delete :destroy, id: transfer_item.to_param, stock_transfer_id: stock_transfer.to_param }
+        subject { delete spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item) }
 
         context "hasn't been finalized" do
           it "can delete a transfer item" do