solidus_api 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb8fffadf8fc2d9ea66ce07a309be1796007c2b3415fdc844a571ca157a00363
-  data.tar.gz: 452378060d6e6f499a2e8804cecda66404543617276dda5c9b458ccf603f0e88
+  metadata.gz: f844a44dd5be31006970426fcce557d3fccfd72157f9d9f73136e8d54ed249b1
+  data.tar.gz: 8175fab98f6b3d9a9ce6726b4f101ed3175d10ff2309bc58f30900bab75dd676
 SHA512:
-  metadata.gz: 17d1b0914d067ec7bcd0fa5b3528b00a02b921f11ac0ebf86a0dca17fdb3eb3f23967a2a291ffd1b41769e5745ef940a8595e7bd1f9758a1a52ee596fb66c937
-  data.tar.gz: b77fd8584ade580c2afa0e9fbcb680e6039a2b677eb3b0469c941611d6d1713a1db58f0215b479502996da3cea2fff059f94557abe304813ee90c02aac8e48b2
+  metadata.gz: 6000ba487ac1332e9a5e5bc02fa9495c13bf6ce25ad0a15050263f771b86e8bf0ef2a3e424bb95a5c0ddaaa7ebd0930e9151b20aac4185ccc763944eba9f8e5a
+  data.tar.gz: e6c8f7a362d7f4f8ab4192cc4fd2ed9b1ab9768425c4d87fa0fb3f566e1a692a903845bd66fe7433cb716215fe6ae2da0ead5631552766d276f5e6a04b42b61b

data/README.md

@@ -1,9 +1,11 @@
 # solidus\_api
 
-API contains controllers and rabl views implementing the REST API of solidus.
+API contains the controllers and rabl views implementing the REST API of Solidus.
 
 ## Testing
 
-Run the tests
+Run the API tests:
 
-    bundle exec rspec
+```bash
+bundle exec rspec
+```

data/app/controllers/spree/api/base_controller.rb

@@ -7,6 +7,7 @@ module Spree
     class BaseController < ActionController::Base
       self.responder = Spree::Api::Responders::AppResponder
       respond_to :json
+      protect_from_forgery unless: -> { request.format.json? }
 
       include CanCan::ControllerAdditions
       include Spree::Core::ControllerHelpers::Store
@@ -99,10 +100,27 @@ module Spree
       end
 
       def api_key
-        request.headers["X-Spree-Token"] || params[:token]
+        bearer_token || spree_token || params[:token]
       end
       helper_method :api_key
 
+      def bearer_token
+        pattern = /^Bearer /
+        header = request.headers["Authorization"]
+        header.gsub(pattern, '') if header.present? && header.match(pattern)
+      end
+
+      def spree_token
+        token = request.headers["X-Spree-Token"]
+        return unless token.present?
+
+        Spree::Deprecation.warn(
+          'The custom X-Spree-Token request header is deprecated and will be removed in the next release.' \
+          ' Please use bearer token authorization header instead.'
+        )
+        token
+      end
+
       def order_token
         request.headers["X-Spree-Order-Token"] || params[:order_token]
       end

data/app/controllers/spree/api/checkouts_controller.rb

@@ -114,6 +114,7 @@ module Spree
 
       def after_update_attributes
         if params[:order] && params[:order][:coupon_code].present?
+          Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
           handler = PromotionHandler::Coupon.new(@order)
           handler.apply
 

data/app/controllers/spree/api/coupon_codes_controller.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Spree
+  module Api
+    class CouponCodesController < Spree::Api::BaseController
+      before_action :load_order
+      around_action :lock_order
+
+      def create
+        authorize! :update, @order, order_token
+
+        @order.coupon_code = params[:coupon_code]
+        @handler = PromotionHandler::Coupon.new(@order).apply
+
+        if @handler.successful?
+          render 'spree/api/promotions/handler', status: 200
+        else
+          logger.error("apply_coupon_code_error=#{@handler.error.inspect}")
+          render 'spree/api/promotions/handler', status: 422
+        end
+      end
+
+      def destroy
+        authorize! :update, @order, order_token
+
+        @order.coupon_code = params[:id]
+        @handler = PromotionHandler::Coupon.new(@order).remove
+
+        if @handler.successful?
+          render 'spree/api/promotions/handler', status: 200
+        else
+          logger.error("remove_coupon_code_error=#{@handler.error.inspect}")
+          render 'spree/api/promotions/handler', status: 422
+        end
+      end
+
+      private
+
+      def load_order
+        @order = Spree::Order.find_by!(number: params[:order_id])
+      end
+    end
+  end
+end

data/app/controllers/spree/api/orders_controller.rb

@@ -51,7 +51,18 @@ module Spree
 
       def index
         authorize! :index, Order
-        @orders = paginate(Spree::Order.ransack(params[:q]).result)
+        orders_includes = [
+          :user,
+          :payments,
+          :adjustments,
+          :line_items
+        ]
+        @orders = paginate(
+          Spree::Order
+            .ransack(params[:q])
+            .result
+            .includes(orders_includes)
+        )
         respond_with(@orders)
       end
 
@@ -92,6 +103,8 @@ module Spree
       end
 
       def apply_coupon_code
+        Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
+
         authorize! :update, @order, order_token
         @order.coupon_code = params[:coupon_code]
         @handler = PromotionHandler::Coupon.new(@order).apply

data/app/controllers/spree/api/products_controller.rb

@@ -8,7 +8,16 @@ module Spree
           ids = params[:ids].split(",").flatten
           @products = product_scope.where(id: ids)
         else
-          @products = product_scope.ransack(params[:q]).result
+          products_includes = [
+            :variants,
+            :option_types,
+            :product_properties,
+            { classifications: :taxon }
+          ]
+          @products = product_scope
+                        .ransack(params[:q])
+                        .result
+                        .includes(products_includes)
         end
 
         @products = paginate(@products.distinct)

data/app/controllers/spree/api/return_authorizations_controller.rb

@@ -4,7 +4,7 @@ module Spree
   module Api
     class ReturnAuthorizationsController < Spree::Api::BaseController
       before_action :load_order
-      around_action :lock_order, only: [:create, :update, :destroy, :add, :receive, :cancel]
+      around_action :lock_order, only: [:create, :update, :destroy, :cancel]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 

data/app/controllers/spree/api/taxons_controller.rb

@@ -12,7 +12,12 @@ module Spree
           @taxons = Spree::Taxon.accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
         end
 
+        unless params[:without_children]
+          @taxons = @taxons.includes(:children)
+        end
+
         @taxons = paginate(@taxons)
+        preload_taxon_parents(@taxons)
         respond_with(@taxons)
       end
 
@@ -106,6 +111,16 @@ module Spree
           {}
         end
       end
+
+      def preload_taxon_parents(taxons)
+        parents = Spree::Taxon.none
+
+        taxons.map do |taxon|
+          parents = parents.or(taxon.ancestors)
+        end
+
+        Spree::Taxon.associate_parents(taxons + parents)
+      end
     end
   end
 end

data/app/views/spree/api/line_items/_line_item.json.jbuilder

@@ -8,7 +8,7 @@ json.cache! [I18n.locale, line_item] do
   json.variant do
     json.partial!("spree/api/variants/small", variant: line_item.variant)
     json.(line_item.variant, :product_id)
-    json.images(line_item.variant.images) do |image|
+    json.images(line_item.variant.gallery.images) do |image|
       json.partial!("spree/api/images/image", image: image)
     end
   end

data/app/views/spree/api/shipments/_big.json.jbuilder

@@ -14,7 +14,7 @@ json.cache! [I18n.locale, shipment] do
     json.variant do
       json.partial!("spree/api/variants/small", variant: inventory_unit.variant)
       json.(inventory_unit.variant, :product_id)
-      json.images(inventory_unit.variant.images) do |image|
+      json.images(inventory_unit.variant.gallery.images) do |image|
         json.partial!("spree/api/images/image", image: image)
       end
     end

data/app/views/spree/api/variants/_small.json.jbuilder

@@ -17,7 +17,7 @@ json.cache! [I18n.locale, variant] do
   json.option_values(variant.option_values) do |option_value|
     json.(option_value, *option_value_attributes)
   end
-  json.images(variant.images) do |image|
+  json.images(variant.gallery.images) do |image|
     json.partial!("spree/api/images/image", image: image)
   end
 end

data/config/routes.rb

@@ -35,9 +35,7 @@ Spree::Core::Engine.routes.draw do
 
       resources :return_authorizations do
         member do
-          put :add
           put :cancel
-          put :receive
         end
       end
     end
@@ -69,6 +67,8 @@ Spree::Core::Engine.routes.draw do
         put :empty
         put :apply_coupon_code
       end
+
+      resources :coupon_codes, only: [:create, :destroy]
     end
 
     resources :zones

data/solidus_api.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.2.2'
   gem.required_rubygems_version = '>= 1.8.23'
 
-  gem.add_dependency 'jbuilder', '~> 2.6'
+  gem.add_dependency 'jbuilder', '~> 2.8'
   gem.add_dependency 'kaminari-activerecord', '~> 1.1'
   gem.add_dependency 'responders'
   gem.add_dependency 'solidus_core', gem.version

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

@@ -52,7 +52,7 @@ describe Spree::Api::BaseController, type: :controller do
     end
 
     it "with an invalid API key" do
-      request.headers["X-Spree-Token"] = "fake_key"
+      request.headers["Authorization"] = "Bearer fake_key"
       get :index, params: {}
       expect(json_response).to eq({ "error" => "Invalid API key (fake_key) specified." })
       expect(response.status).to eq(401)

data/spec/features/checkout_spec.rb

@@ -62,7 +62,7 @@ module Spree
 
     def add_promotion(_promotion)
       expect {
-        put "/api/orders/#{@order.number}/apply_coupon_code",
+        post "/api/orders/#{@order.number}/coupon_codes",
           params: { coupon_code: promotion_code.value }
       }.to change { @order.promotions.count }.by 1
       expect(response).to have_http_status(:ok)
@@ -143,10 +143,6 @@ module Spree
             0 => { variant_id: variant_1.id, quantity: 2 },
             1 => { variant_id: variant_2.id, quantity: 2 }
           },
-          # Would like to do this, but the save process from the orders controller
-          # does not actually call what it needs to to apply this coupon code :(
-          # coupon_code: promotion.code,
-
           # Would like to do this, but it puts the payment in a complete state,
           # which the order does not like when transitioning from confirm to complete
           # since it looks to process pending payments.
@@ -175,10 +171,6 @@ module Spree
             0 => { variant_id: variant_1.id, quantity: 2 },
             1 => { variant_id: variant_2.id, quantity: 2 }
           },
-          # Would like to do this, but the save process from the orders controller
-          # does not actually call what it needs to to apply this coupon code :(
-          # coupon_code: promotion.code,
-
           # Would like to do this, but it puts the payment in a complete state,
           # which the order does not like when transitioning from confirm to complete
           # since it looks to process pending payments.

data/spec/requests/api/address_books_spec.rb

@@ -41,7 +41,7 @@ module Spree
           user.save_in_address_book(ron_address_attributes, false)
 
           get "/api/users/#{user.id}/address_book",
-            headers: { 'X-SPREE-TOKEN' => 'galleon' }
+            headers: { Authorization: 'Bearer galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
@@ -60,7 +60,7 @@ module Spree
           expect {
             put "/api/users/#{user.id}/address_book",
               params:  { address_book: harry_address_attributes.merge('id' => address.id) },
-              headers: { 'X-SPREE-TOKEN' => 'galleon' }
+              headers: { Authorization: 'Bearer galleon' }
           }.to change { UserAddress.count }.from(1).to(2)
 
           expect(response.status).to eq(200)
@@ -74,7 +74,7 @@ module Spree
             expect {
               put "/api/users/#{user.id}/address_book",
                 params:  { address_book: harry_address_attributes },
-                headers: { 'X-SPREE-TOKEN' => 'galleon' }
+                headers: { Authorization: 'Bearer galleon' }
             }.to change { UserAddress.count }.by(1)
 
             user_address = UserAddress.last
@@ -93,7 +93,7 @@ module Spree
             expect {
               put "/api/users/#{user.id}/address_book",
                 params:  { address_book: harry_address_attributes },
-                headers: { 'X-SPREE-TOKEN' => 'galleon' }
+                headers: { Authorization: 'Bearer galleon' }
             }.to_not change { UserAddress.count }
 
             expect(response.status).to eq(200)
@@ -110,7 +110,7 @@ module Spree
           expect {
             delete "/api/users/#{user.id}/address_book",
               params:  { address_id: address.id },
-              headers: { 'X-SPREE-TOKEN' => 'galleon' }
+              headers: { Authorization: 'Bearer galleon' }
           }.to change { user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -131,7 +131,7 @@ module Spree
           other_user.save_in_address_book(ron_address_attributes, false)
 
           get "/api/users/#{other_user.id}/address_book",
-            headers: { 'X-SPREE-TOKEN' => 'galleon' }
+            headers: { Authorization: 'Bearer galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
@@ -150,7 +150,7 @@ module Spree
           expect {
             put "/api/users/#{other_user.id}/address_book",
             params:  { address_book: updated_harry_address.merge('id' => address.id) },
-            headers: { 'X-SPREE-TOKEN' => 'galleon' }
+            headers: { Authorization: 'Bearer galleon' }
           }.to change { UserAddress.count }.from(1).to(2)
 
           expect(response.status).to eq(200)
@@ -165,7 +165,7 @@ module Spree
           expect {
             delete "/api/users/#{other_user.id}/address_book",
               params:  { address_id: address.id },
-              headers: { 'X-SPREE-TOKEN' => 'galleon' }
+              headers: { Authorization: 'Bearer galleon' }
           }.to change { other_user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -179,7 +179,7 @@ module Spree
           other_user.save_in_address_book(harry_address_attributes, true)
 
           get "/api/users/#{other_user.id}/address_book",
-            headers: { 'X-SPREE-TOKEN' => 'galleon' }
+            headers: { Authorization: 'Bearer galleon' }
 
           expect(response.status).to eq(401)
         end
@@ -193,7 +193,7 @@ module Spree
           expect {
             put "/api/users/#{other_user.id}/address_book",
             params:  { address_book: other_user_address.attributes.merge('address1' => 'Hogwarts') },
-            headers: { 'X-SPREE-TOKEN' => 'galleon' }
+            headers: { Authorization: 'Bearer galleon' }
           }.not_to change { UserAddress.count }
 
           expect(response.status).to eq(401)
@@ -208,7 +208,7 @@ module Spree
           expect {
             delete "/api/users/#{other_user.id}/address_book",
               params:  { address_id: address.id },
-              headers: { 'X-SPREE-TOKEN' => 'galleon' }
+              headers: { Authorization: 'Bearer galleon' }
           }.not_to change { other_user.user_addresses.count }
 
           expect(response.status).to eq(401)

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

@@ -357,6 +357,7 @@ module Spree
       end
 
       it "can apply a coupon code to an order" do
+        expect(Spree::Deprecation).to receive(:warn)
         order.update_column(:state, "payment")
         expect(PromotionHandler::Coupon).to receive(:new).with(order).and_call_original
         expect_any_instance_of(PromotionHandler::Coupon).to receive(:apply).and_return({ coupon_applied?: true })
@@ -365,6 +366,7 @@ module Spree
       end
 
       it "renders error failing to apply coupon" do
+        expect(Spree::Deprecation).to receive(:warn)
         order.update_column(:state, "payment")
         put spree.api_checkout_path(order.to_param), params: { order_token: order.guest_token, order: { coupon_code: "foobar" } }
         expect(response.status).to eq(422)

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

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Spree
+  describe Api::CouponCodesController, type: :request do
+    let(:current_api_user) do
+      user = Spree.user_class.new(email: "spree@example.com")
+      user.generate_spree_api_key!
+      user
+    end
+
+    before do
+      stub_authentication!
+    end
+
+    describe '#create' do
+      let(:promo) { create(:promotion_with_item_adjustment, code: 'night_melody') }
+      let(:promo_code) { promo.codes.first }
+
+      before do
+        allow_any_instance_of(Order).to receive_messages user: current_api_user
+      end
+
+      context 'when successful' do
+        let(:order) { create(:order_with_line_items) }
+
+        it 'applies the coupon' do
+          post spree.api_order_coupon_codes_path(order), params: { coupon_code: promo_code.value }
+
+          expect(response.status).to eq(200)
+          expect(order.reload.promotions).to eq([promo])
+          expect(json_response).to eq({
+            "success" => I18n.t('spree.coupon_code_applied'),
+            "error" => nil,
+            "successful" => true,
+            "status_code" => "coupon_code_applied"
+          })
+        end
+      end
+
+      context 'when unsuccessful' do
+        let(:order) { create(:order) }
+
+        it 'returns an error' do
+          post spree.api_order_coupon_codes_path(order), params: { coupon_code: promo_code.value }
+
+          expect(response.status).to eq(422)
+          expect(order.reload.promotions).to eq([])
+          expect(json_response).to eq({
+            "success" => nil,
+            "error" => I18n.t('spree.coupon_code_unknown_error'),
+            "successful" => false,
+            "status_code" => "coupon_code_unknown_error"
+          })
+        end
+      end
+    end
+
+    describe '#destroy' do
+      let(:promo) {
+        create(:promotion_with_item_adjustment,
+               code: 'tenoff',
+               per_code_usage_limit: 5,
+               adjustment_rate: 10)
+      }
+
+      let(:promo_code) { promo.codes.first }
+      let(:order) { create(:order_with_line_items, user: current_api_user) }
+
+      before do
+        post spree.api_order_coupon_codes_path(order), params: { coupon_code: promo_code.value }
+        delete spree.api_order_coupon_code_path(order, promo_code.value)
+      end
+
+      context 'when successful' do
+        it 'removes the coupon' do
+          expect(response.status).to eq(200)
+          expect(order.reload.promotions).to eq([])
+          expect(json_response).to eq({
+            "success" => I18n.t('spree.coupon_code_removed'),
+            "error" => nil,
+            "successful" => true,
+            "status_code" => "coupon_code_removed"
+          })
+        end
+      end
+
+      context 'when unsuccessful' do
+        it 'returns an error' do
+          delete spree.api_order_coupon_code_path(order, promo_code.value)
+
+          expect(response.status).to eq(422)
+          expect(order.reload.promotions).to eq([])
+          expect(json_response).to eq({
+            "success" => nil,
+            "error" => I18n.t('spree.coupon_code_not_present'),
+            "successful" => false,
+            "status_code" => "coupon_code_not_present"
+          })
+        end
+      end
+    end
+  end
+end

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

@@ -81,7 +81,9 @@ module Spree
       end
 
       it "can add a new line item to an existing order with options" do
-        expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
+        without_partial_double_verification do
+          expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
+        end
         post spree.api_order_line_items_path(order),
                  params: {
                                     line_item: {
@@ -121,7 +123,9 @@ module Spree
       end
 
       it "can update a line item's options on the order" do
-        expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
+        without_partial_double_verification do
+          expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
+        end
         line_item = order.line_items.first
         put spree.api_order_line_item_path(order, line_item),
                 params: {

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

@@ -421,7 +421,9 @@ module Spree
 
     # Regression test for https://github.com/spree/spree/issues/3404
     it "can specify additional parameters for a line item" do
-      expect_any_instance_of(Spree::LineItem).to receive(:special=).with("foo")
+      without_partial_double_verification do
+        expect_any_instance_of(Spree::LineItem).to receive(:special=).with("foo")
+      end
 
       allow_any_instance_of(Spree::Api::OrdersController).to receive_messages(permitted_line_item_attributes: [:id, :variant_id, :quantity, :special])
       post spree.api_orders_path, params: {
@@ -854,6 +856,8 @@ module Spree
         let(:order) { create(:order_with_line_items) }
 
         it 'applies the coupon' do
+          expect(Spree::Deprecation).to receive(:warn)
+
           put spree.apply_coupon_code_api_order_path(order), params: { coupon_code: promo_code.value }
 
           expect(response.status).to eq 200
@@ -871,6 +875,8 @@ module Spree
         let(:order) { create(:order) } # no line items to apply the code to
 
         it 'returns an error' do
+          expect(Spree::Deprecation).to receive(:warn)
+
           put spree.apply_coupon_code_api_order_path(order), params: { coupon_code: promo_code.value }
 
           expect(response.status).to eq 422

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

@@ -20,7 +20,7 @@ module Spree::Api
 
       it "can apply a coupon code to the order" do
         expect(order.total).to eq(110.00)
-        put spree.apply_coupon_code_api_order_path(order), params: { coupon_code: "10off", order_token: order.guest_token }
+        post spree.api_order_coupon_codes_path(order), params: { coupon_code: "10off", order_token: order.guest_token }
         expect(response.status).to eq(200)
         expect(order.reload.total).to eq(109.00)
         expect(json_response["success"]).to eq("The coupon code was successfully applied to your order.")
@@ -37,7 +37,7 @@ module Spree::Api
         end
 
         it "fails to apply" do
-          put spree.apply_coupon_code_api_order_path(order), params: { coupon_code: "10off", order_token: order.guest_token }
+          post spree.api_order_coupon_codes_path(order), params: { coupon_code: "10off", order_token: order.guest_token }
           expect(response.status).to eq(422)
           expect(json_response["success"]).to be_blank
           expect(json_response["error"]).to eq("The coupon code is expired")

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

@@ -262,7 +262,7 @@ describe Spree::Api::ShipmentsController, type: :request do
 
     it "returns success" do
       subject
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it "returns rates available to user" do

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

@@ -7,7 +7,7 @@ describe Spree::Api::StoreCreditEventsController, type: :request do
 
   describe "GET mine" do
     subject do
-      get spree.mine_api_store_credit_events_path(format: :json), headers: { 'X-Spree-Token' => api_key }
+      get spree.mine_api_store_credit_events_path(format: :json), headers: { Authorization: "Bearer #{api_key}" }
     end
 
     context "no current api user" do

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

@@ -4,16 +4,14 @@ require 'spec_helper'
 
 module Spree
   describe Api::TaxonsController, type: :request do
-    let(:taxonomy) { create(:taxonomy) }
-    let(:taxon) { create(:taxon, name: "Ruby", taxonomy: taxonomy) }
-    let(:taxon2) { create(:taxon, name: "Rails", taxonomy: taxonomy) }
+    let!(:taxonomy) { create(:taxonomy) }
+    let!(:taxon) { create(:taxon, name: "Ruby", parent: taxonomy.root, taxonomy: taxonomy) }
+    let!(:taxon2) { create(:taxon, name: "Rails", parent: taxon, taxonomy: taxonomy) }
+    let!(:rails_v3_2_2) { create(:taxon, name: "3.2.2", parent: taxon2, taxonomy: taxonomy) }
     let(:attributes) { ["id", "name", "pretty_name", "permalink", "parent_id", "taxonomy_id"] }
 
     before do
       stub_authentication!
-      taxon2.children << create(:taxon, name: "3.2.2", taxonomy: taxonomy)
-      taxon.children << taxon2
-      taxonomy.root.children << taxon
     end
 
     context "as a normal user" do
@@ -85,6 +83,24 @@ module Spree
         end
       end
 
+      context 'filtering by taxon ids' do
+        it 'returns only requested id' do
+          get spree.api_taxons_path, params: { ids: [rails_v3_2_2.id] }
+
+          expect(json_response['taxons'].size).to eq 1
+        end
+
+        it 'returns only requested ids' do
+          # We need a completly new branch to avoid having parent that can be preloaded from the rails ancestors
+          python   = create(:taxon, name: "Python", parent: taxonomy.root, taxonomy: taxonomy)
+          python_3 = create(:taxon, name: "3.0", parent: python, taxonomy: taxonomy)
+
+          get spree.api_taxons_path, params: { ids: [rails_v3_2_2.id, python_3.id] }
+
+          expect(json_response['taxons'].size).to eq 2
+        end
+      end
+
       it "gets a single taxon" do
         get spree.api_taxonomy_taxon_path(taxonomy, taxon.id)
 

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ require 'with_model'
 # in spec/support/ and its subdirectories.
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
+require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
 require 'spree/testing_support/authorization_helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: kaminari-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -83,6 +83,7 @@ files:
 - app/controllers/spree/api/classifications_controller.rb
 - app/controllers/spree/api/config_controller.rb
 - app/controllers/spree/api/countries_controller.rb
+- app/controllers/spree/api/coupon_codes_controller.rb
 - app/controllers/spree/api/credit_cards_controller.rb
 - app/controllers/spree/api/images_controller.rb
 - app/controllers/spree/api/inventory_units_controller.rb
@@ -251,6 +252,7 @@ files:
 - spec/requests/spree/api/classifications_controller_spec.rb
 - spec/requests/spree/api/config_controller_spec.rb
 - spec/requests/spree/api/countries_controller_spec.rb
+- spec/requests/spree/api/coupon_codes_controller_spec.rb
 - spec/requests/spree/api/credit_cards_controller_spec.rb
 - spec/requests/spree/api/images_controller_spec.rb
 - spec/requests/spree/api/inventory_units_controller_spec.rb
@@ -307,7 +309,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.
@@ -325,6 +328,7 @@ test_files:
 - spec/requests/spree/api/classifications_controller_spec.rb
 - spec/requests/spree/api/config_controller_spec.rb
 - spec/requests/spree/api/countries_controller_spec.rb
+- spec/requests/spree/api/coupon_codes_controller_spec.rb
 - spec/requests/spree/api/credit_cards_controller_spec.rb
 - spec/requests/spree/api/images_controller_spec.rb
 - spec/requests/spree/api/inventory_units_controller_spec.rb