solidus_api 1.4.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487255d3c7c9a28a0e6b9ed4cc984f1ff0a0dc88
-  data.tar.gz: 94190cac19ab74bb6f10c2e588de1ebbbb75d9b5
+  metadata.gz: 6bdb449ae51b17c27435793ebdc4107e57044fcd
+  data.tar.gz: 5912114dc2bf082204c7a0ae720caeb892adbf8a
 SHA512:
-  metadata.gz: 0435e1961c6ee011b4f6482f5848c452b69f6f43e54fb2c887e80f5c81dc9ccbae61eb9d581b824697736b20196e3945939543dc59275c785dad150c283556ff
-  data.tar.gz: 5dc3ba08436b3cc53028699bb81a9c8627d04427f18b0e5ee1d343e6e099b8c70fc8c075f877bfb2b8c42d4dfcdce6c46ee9a1b7b812285f3e556d48033457e2
+  metadata.gz: a72d35bef9dd506a1076c15d6ec5e8488983c47adc2dd453deff71e0766e93ef9d48dbe09e182a7d133e84d6db46d905d3e73940617c83cead9017838662820b
+  data.tar.gz: 8f78217ba3ac3d82313de4ddd920f92a91a2715572952a2bad074f25c95c473ef2bb62931c8a016d556908b0b8cbd8258a579e839cd6f1d01142c75c670572d4

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

@@ -73,8 +73,7 @@ module Spree
 
         error_notifier.call(exception, self) if error_notifier
 
-        render text: { exception: exception.message }.to_json,
-          status: 422
+        render json: { exception: exception.message }, status: 422
       end
 
       def gateway_error(exception)
@@ -149,7 +148,7 @@ module Spree
       def lock_order
         OrderMutex.with_lock!(@order) { yield }
       rescue Spree::OrderMutex::LockFailed => e
-        render text: e.message, status: 409
+        render plain: e.message, status: 409
       end
 
       def insufficient_stock_error(exception)

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

@@ -34,7 +34,7 @@ module Spree
 
         unless inventory_unit.respond_to?(can_event) &&
                inventory_unit.send(can_event)
-          render text: { exception: "cannot transition to #{@event}" }.to_json,
+          render json: { exception: "cannot transition to #{@event}" },
                  status: 200
           false
         end

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

@@ -18,7 +18,7 @@ module Spree
           params[:line_item][:quantity] || 1,
           {
             stock_location_quantities: params[:line_item][:stock_location_quantities]
-          }.merge(line_item_params[:options] || {})
+          }.merge(line_item_params[:options].to_h || {})
         )
 
         if @line_item.errors.empty?

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

@@ -37,7 +37,7 @@ module Spree
       def destroy
         @option_type = Spree::OptionType.accessible_by(current_ability, :destroy).find(params[:id])
         @option_type.destroy
-        render text: nil, status: 204
+        render plain: nil, status: 204
       end
 
       private

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

@@ -37,7 +37,7 @@ module Spree
       def destroy
         @option_value = scope.accessible_by(current_ability, :destroy).find(params[:id])
         @option_value.destroy
-        render text: nil, status: 204
+        render plain: nil, status: 204
       end
 
       private

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

@@ -27,24 +27,14 @@ module Spree
 
       def create
         authorize! :create, Order
-
-        if can?(:admin, Order)
-          @order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
-          respond_with(@order, default_template: :show, status: 201)
-        else
-          @order = Spree::Order.create!(user: current_api_user, store: current_store)
-          if OrderUpdateAttributes.new(@order, order_params).apply
-            respond_with(@order, default_template: :show, status: 201)
-          else
-            invalid_resource!(@order)
-          end
-        end
+        @order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
+        respond_with(@order, default_template: :show, status: 201)
       end
 
       def empty
         authorize! :update, @order, order_token
         @order.empty!
-        render text: nil, status: 204
+        render plain: nil, status: 204
       end
 
       def index

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

@@ -16,7 +16,6 @@ module Spree
       end
 
       def create
-        @order.validate_payments_attributes(payment_params)
         @payment = PaymentCreate.new(@order, payment_params).build
         if @payment.save
           respond_with(@payment, status: 201, default_template: :show)

data/config/initializers/rails5_rabl_hacks.rb

@@ -0,0 +1,12 @@
+# As of 2016-08-17 rabl is broken on rails 5.
+# This prevents errors when caching is enabled
+if Rabl::VERSION == "0.13.0"
+  # Remove the broken redefinition of digest
+  Rabl::Digestor.class_eval do
+    class << self
+      remove_method :digest
+    end
+  end
+else
+  raise "Remove this monkey patch"
+end

data/db/migrate/20100107141738_add_api_key_to_spree_users.rb

@@ -1,4 +1,4 @@
-class AddApiKeyToSpreeUsers < ActiveRecord::Migration
+class AddApiKeyToSpreeUsers < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)
       add_column :spree_users, :api_key, :string, limit: 40

data/db/migrate/20120411123334_resize_api_key_field.rb

@@ -1,4 +1,4 @@
-class ResizeApiKeyField < ActiveRecord::Migration
+class ResizeApiKeyField < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)
       change_column :spree_users, :api_key, :string, limit: 48

data/db/migrate/20120530054546_rename_api_key_to_spree_api_key.rb

@@ -1,4 +1,4 @@
-class RenameApiKeyToSpreeApiKey < ActiveRecord::Migration
+class RenameApiKeyToSpreeApiKey < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)
       rename_column :spree_users, :api_key, :spree_api_key

data/db/migrate/20131017162334_add_index_to_user_spree_api_key.rb

@@ -1,4 +1,4 @@
-class AddIndexToUserSpreeApiKey < ActiveRecord::Migration
+class AddIndexToUserSpreeApiKey < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)
       add_index :spree_users, :spree_api_key

data/solidus_api.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.version = Spree.solidus_version
 
   gem.add_dependency 'solidus_core', gem.version
-  gem.add_dependency 'rabl', ['>= 0.9.4.pre1', '< 0.12.0']
+  gem.add_dependency 'rabl', '0.13.0' # FIXME: update for proper rails 5 support
   gem.add_dependency 'versioncake', '~> 3.0'
 end

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

@@ -9,7 +9,7 @@ describe Spree::Api::BaseController, type: :controller do
     rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
     def index
-      render text: { "products" => [] }.to_json
+      render json: { "products" => [] }
     end
   end
 
@@ -51,13 +51,13 @@ describe Spree::Api::BaseController, type: :controller do
 
     it "with an invalid API key" do
       request.headers["X-Spree-Token"] = "fake_key"
-      get :index, {}
+      get :index, params: {}
       expect(json_response).to eq({ "error" => "Invalid API key (fake_key) specified." })
       expect(response.status).to eq(401)
     end
 
     it "using an invalid token param" do
-      get :index, token: "fake_key"
+      get :index, params: { token: "fake_key" }
       expect(json_response).to eq({ "error" => "Invalid API key (fake_key) specified." })
     end
   end
@@ -66,8 +66,9 @@ describe Spree::Api::BaseController, type: :controller do
     expect(subject).to receive(:authenticate_user).and_return(true)
     expect(subject).to receive(:load_user_roles).and_return(true)
     expect(subject).to receive(:index).and_raise("no joy")
-    get :index, token: "fake_key"
+    get :index, params: { token: "fake_key" }
     expect(json_response).to eq({ "exception" => "no joy" })
+    expect(response.content_type).to eq("application/json")
   end
 
   it 'raises Exception' do
@@ -75,7 +76,7 @@ describe Spree::Api::BaseController, type: :controller do
     expect(subject).to receive(:load_user_roles).and_return(true)
     expect(subject).to receive(:index).and_raise(Exception.new("no joy"))
     expect {
-      get :index, token: "fake_key"
+      get :index, params: { token: "fake_key" }
     }.to raise_error(Exception, "no joy")
   end
 
@@ -125,7 +126,7 @@ describe Spree::Api::BaseController, type: :controller do
     before do
       expect(subject).to receive(:authenticate_user).and_return(true)
       expect(subject).to receive(:index).and_raise(Spree::Order::InsufficientStock)
-      get :index, token: "fake_key"
+      get :index, params: { token: "fake_key" }
     end
 
     it "should return a 422" do
@@ -146,7 +147,7 @@ describe Spree::Api::BaseController, type: :controller do
       around_action :lock_order
 
       def index
-        render text: { "products" => [] }.to_json
+        render json: { "products" => [] }
       end
     end
 

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

@@ -163,19 +163,6 @@ module Spree
         expect(response.status).to eq(200)
       end
 
-      context "with disallowed payment method" do
-        it "returns not found" do
-          order.update_column(:state, "payment")
-          allow_any_instance_of(Spree::Gateway::Bogus).to receive(:source_required?).and_return(false)
-          @payment_method.update!(display_on: "back_end")
-          expect {
-            api_put :update, id: order.to_param, order_token: order.guest_token, order: { payments_attributes: [{ payment_method_id: @payment_method.id }] }
-          }.not_to change { Spree::Payment.count }
-          expect(response.status).to eq(404)
-        end
-      end
-
-
       it "returns errors when source is required and missing" do
         order.update_column(:state, "payment")
         api_put :update, id: order.to_param, order_token: order.guest_token,

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

@@ -32,9 +32,8 @@ module Spree
     describe "POST create" do
       let(:target_user) { create :user }
       let(:date_override) { Time.parse('2015-01-01') }
-      let(:attributes) { { user_id: target_user.id, created_at: date_override, email: target_user.email } }
 
-      subject { api_post :create, order: attributes }
+      subject { api_post :create, order: { user_id: target_user.id, created_at: date_override, email: target_user.email } }
 
       context "when the current user cannot administrate the order" do
         stub_authorization! do |_|
@@ -43,37 +42,12 @@ module Spree
 
         it "does not include unpermitted params, or allow overriding the user", focus: true do
           subject
-          expect(response).to be_success
           order = Spree::Order.last
           expect(order.user).to eq current_api_user
           expect(order.email).to eq target_user.email
         end
 
         it { is_expected.to be_success }
-
-        context 'creating payment' do
-          let(:attributes) { super().merge(payments_attributes: [{ payment_method_id: payment_method.id }]) }
-
-          context "with allowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
-            it "creates a payment" do
-              expect {
-                subject
-              }.to change { Spree::Payment.count }.by(1)
-            end
-          end
-
-          context "with disallowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "forbidden", display_on: "back_end") }
-            it { is_expected.to be_not_found }
-            it "creates no payments" do
-              expect {
-                subject
-              }.not_to change { Spree::Payment.count }
-            end
-          end
-        end
       end
 
       context "when the current user can administrate the order" do
@@ -123,30 +97,6 @@ module Spree
             subject
           }.to_not change{ order.reload.number }
         end
-
-        context 'creating payment' do
-          let(:order_params) { super().merge(payments_attributes: [{ payment_method_id: payment_method.id }]) }
-
-          context "with allowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
-            it "creates a payment" do
-              expect {
-                subject
-              }.to change { Spree::Payment.count }.by(1)
-            end
-          end
-
-          context "with disallowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "forbidden", display_on: "back_end") }
-            it { is_expected.to be_not_found }
-            it "creates no payments" do
-              expect {
-                subject
-              }.not_to change { Spree::Payment.count }
-            end
-          end
-        end
       end
 
       context "when the user can administer the order" do
@@ -216,13 +166,13 @@ module Spree
       end
 
       it "returns orders in reverse chronological order by completed_at" do
-        order.update_columns completed_at: Time.current, created_at: 3.days.ago
+        order.update_columns completed_at: Time.current
 
-        order2 = Order.create user: order.user, completed_at: Time.current - 1.day, created_at: 2.day.ago, store: store
+        order2 = Order.create user: order.user, completed_at: Time.current - 1.day, store: store
         expect(order2.created_at).to be > order.created_at
-        order3 = Order.create user: order.user, completed_at: nil, created_at: 1.day.ago, store: store
+        order3 = Order.create user: order.user, completed_at: nil, store: store
         expect(order3.created_at).to be > order2.created_at
-        order4 = Order.create user: order.user, completed_at: nil, created_at: 0.days.ago, store: store
+        order4 = Order.create user: order.user, completed_at: nil, store: store
         expect(order4.created_at).to be > order3.created_at
 
         request.env['SERVER_NAME'] = store.url
@@ -383,7 +333,10 @@ 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")
+      expect(Order).to receive(:create!).and_return(order = Spree::Order.new)
+      allow(order).to receive(:associate_user!)
+      allow(order).to receive_message_chain(:contents, :add).and_return(line_item = double('LineItem'))
+      expect(line_item).to receive(:update_attributes!).with(hash_including("special" => "foo"))
 
       allow(controller).to receive_messages(permitted_line_item_attributes: [:id, :variant_id, :quantity, :special])
       api_post :create, order: {

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

@@ -45,17 +45,6 @@ module Spree
             expect(response.status).to eq(201)
             expect(json_response).to have_attributes(attributes)
           end
-
-          context "disallowed payment method" do
-            it "does not create a new payment" do
-              PaymentMethod.first.update!(display_on: "back_end")
-
-              expect {
-                api_post :create, payment: { payment_method_id: PaymentMethod.first.id, amount: 50 }
-              }.not_to change { Spree::Payment.count }
-              expect(response.status).to eq(404)
-            end
-          end
         end
 
         context "payment source is required" do

data/spec/features/checkout_spec.rb

@@ -24,7 +24,12 @@ module Spree
 
     def login
       expect {
-        post '/api/users', user: { email: "featurecheckoutuser@example.com", password: "featurecheckoutuser" }
+        post '/api/users', params: {
+          user: {
+            email: "featurecheckoutuser@example.com",
+            password: "featurecheckoutuser"
+          }
+        }
       }.to change { Spree.user_class.count }.by 1
       expect(response).to have_http_status(:created)
       @user = Spree.user_class.find(parsed['id'])
@@ -34,27 +39,29 @@ module Spree
     end
 
     def create_order(order_params: {})
-      expect { post '/api/orders', order_params }.to change { Order.count }.by 1
+      expect { post '/api/orders', params: order_params }.to change { Order.count }.by 1
       expect(response).to have_http_status(:created)
       @order = Order.find(parsed['id'])
       expect(@order.email).to eq "featurecheckoutuser@example.com"
     end
 
     def update_order(order_params: {})
-      put "/api/orders/#{@order.number}", order_params
+      put "/api/orders/#{@order.number}", params: order_params
       expect(response).to have_http_status(:ok)
     end
 
     def create_line_item(variant, quantity = 1)
       expect {
-        post "/api/orders/#{@order.number}/line_items", line_item: { variant_id: variant.id, quantity: quantity }
+        post "/api/orders/#{@order.number}/line_items",
+          params: { line_item: { variant_id: variant.id, quantity: quantity } }
       }.to change { @order.line_items.count }.by 1
       expect(response).to have_http_status(:created)
     end
 
     def add_promotion(_promotion)
       expect {
-        put "/api/orders/#{@order.number}/apply_coupon_code", coupon_code: promotion_code.value
+        put "/api/orders/#{@order.number}/apply_coupon_code",
+          params: { coupon_code: promotion_code.value }
       }.to change { @order.promotions.count }.by 1
       expect(response).to have_http_status(:ok)
     end
@@ -70,7 +77,8 @@ module Spree
 
     def add_payment
       expect {
-        post "/api/orders/#{@order.number}/payments", payment: { payment_method_id: payment_method.id }
+        post "/api/orders/#{@order.number}/payments",
+          params: { payment: { payment_method_id: payment_method.id } }
       }.to change { @order.reload.payments.count }.by 1
       expect(response).to have_http_status(:created)
       expect(@order.payments.last.payment_method).to eq payment_method

data/spec/requests/api/address_books_spec.rb

@@ -38,7 +38,8 @@ module Spree
           user.save_in_address_book(harry_address_attributes, true)
           user.save_in_address_book(ron_address_attributes, false)
 
-          get "/api/users/#{user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
+          get "/api/users/#{user.id}/address_book",
+            headers: { 'X-SPREE-TOKEN' => 'galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
@@ -55,7 +56,9 @@ module Spree
           harry_address_attributes['firstname'] = 'Ron'
 
           expect {
-            put "/api/users/#{user.id}/address_book", { address_book: harry_address_attributes.merge('id' => address.id) }, { 'X-SPREE-TOKEN' => 'galleon' }
+            put "/api/users/#{user.id}/address_book",
+              params:  { address_book: harry_address_attributes.merge('id' => address.id) },
+              headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { UserAddress.count }.from(1).to(2)
 
           expect(response.status).to eq(200)
@@ -67,7 +70,9 @@ module Spree
             user = create(:user, spree_api_key: 'galleon')
 
             expect {
-              put "/api/users/#{user.id}/address_book", { address_book: harry_address_attributes }, { 'X-SPREE-TOKEN' => 'galleon' }
+              put "/api/users/#{user.id}/address_book",
+                params:  { address_book: harry_address_attributes },
+                headers: { 'X-SPREE-TOKEN' => 'galleon' }
             }.to change { UserAddress.count }.by(1)
 
             user_address = UserAddress.last
@@ -84,7 +89,9 @@ module Spree
             address = user.save_in_address_book(harry_address_attributes, true)
 
             expect {
-              put "/api/users/#{user.id}/address_book", { address_book: harry_address_attributes }, { 'X-SPREE-TOKEN' => 'galleon' }
+              put "/api/users/#{user.id}/address_book",
+                params:  { address_book: harry_address_attributes },
+                headers: { 'X-SPREE-TOKEN' => 'galleon' }
             }.to_not change { UserAddress.count }
 
             expect(response.status).to eq(200)
@@ -99,7 +106,9 @@ module Spree
           user.save_in_address_book(address.attributes, false)
 
           expect {
-            delete "/api/users/#{user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon' }
+            delete "/api/users/#{user.id}/address_book",
+              params:  { address_id: address.id },
+              headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -121,7 +130,8 @@ module Spree
           other_user.save_in_address_book(harry_address_attributes, true)
           other_user.save_in_address_book(ron_address_attributes, false)
 
-          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
+          get "/api/users/#{other_user.id}/address_book",
+          headers: { 'X-SPREE-TOKEN' => 'galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
@@ -138,7 +148,9 @@ module Spree
           updated_harry_address = harry_address_attributes.merge('firstname' => 'Ron')
 
           expect {
-            put "/api/users/#{other_user.id}/address_book", { address_book: updated_harry_address.merge('id' => address.id) }, { 'X-SPREE-TOKEN' => 'galleon' }
+            put "/api/users/#{other_user.id}/address_book",
+            params:  { address_book: updated_harry_address.merge('id' => address.id) },
+            headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { UserAddress.count }.from(1).to(2)
 
           expect(response.status).to eq(200)
@@ -151,7 +163,9 @@ module Spree
           other_user.save_in_address_book(address.attributes, false)
 
           expect {
-            delete "/api/users/#{other_user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon' }
+            delete "/api/users/#{other_user.id}/address_book",
+              params:  { address_id: address.id },
+              headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { other_user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -164,7 +178,8 @@ module Spree
           other_user = create(:user)
           other_user.save_in_address_book(harry_address_attributes, true)
 
-          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
+          get "/api/users/#{other_user.id}/address_book",
+            headers: { 'X-SPREE-TOKEN' => 'galleon' }
 
           expect(response.status).to eq(401)
         end
@@ -176,7 +191,9 @@ module Spree
           create(:user, spree_api_key: 'galleon')
 
           expect {
-            put "/api/users/#{other_user.id}/address_book", { address_book: other_user_address.attributes.merge('address1' => 'Hogwarts') }, { 'X-SPREE-TOKEN' => 'galleon' }
+            put "/api/users/#{other_user.id}/address_book",
+            params:  { address_book: other_user_address.attributes.merge('address1' => 'Hogwarts') },
+            headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.not_to change { UserAddress.count }
 
           expect(response.status).to eq(401)
@@ -189,7 +206,9 @@ module Spree
           create(:user, spree_api_key: 'galleon')
 
           expect {
-            delete "/api/users/#{other_user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon' }
+            delete "/api/users/#{other_user.id}/address_book",
+              params:  { address_id: address.id },
+              headers: { 'X-SPREE-TOKEN' => 'galleon' }
           }.not_to change { other_user.user_addresses.count }
 
           expect(response.status).to eq(401)

data/spec/requests/rabl_cache_spec.rb

@@ -10,7 +10,7 @@ describe "Rabl Cache", type: :request, caching: true do
   end
 
   it "doesn't create a cache key collision for models with different rabl templates" do
-    get "/api/variants", token: user.spree_api_key
+    get "/api/variants", params: { token: user.spree_api_key }
     expect(response.status).to eq(200)
 
     # Make sure we get a non master variant
@@ -21,7 +21,7 @@ describe "Rabl Cache", type: :request, caching: true do
     expect(variant_a['is_master']).to be false
     expect(variant_a['stock_items']).not_to be_nil
 
-    get "/api/products/#{Spree::Product.first.id}", token: user.spree_api_key
+    get "/api/products/#{Spree::Product.first.id}", params: { token: user.spree_api_key }
     expect(response.status).to eq(200)
     variant_b = JSON.parse(response.body)['variants'].last
     expect(variant_b['is_master']).to be false

data/spec/requests/ransackable_attributes_spec.rb

@@ -7,7 +7,7 @@ describe "Ransackable Attributes" do
     it "does not allow the filtering of variants by order attributes" do
       2.times { create(:variant) }
 
-      get "/api/variants?q[orders_email_start]=#{order.email}", token: user.spree_api_key
+      get "/api/variants?q[orders_email_start]=#{order.email}", params: { token: user.spree_api_key }
 
       variants_response = JSON.parse(response.body)
       expect(variants_response['total_count']).to eq(Spree::Variant.count)
@@ -18,7 +18,7 @@ describe "Ransackable Attributes" do
     it "does not allow the filtering of variants by user attributes" do
       2.times { create(:variant) }
 
-      get "/api/variants?q[orders_user_email_start]=#{order.user.email}", token: user.spree_api_key
+      get "/api/variants?q[orders_user_email_start]=#{order.user.email}", params: { token: user.spree_api_key }
 
       variants_response = JSON.parse(response.body)
       expect(variants_response['total_count']).to eq(Spree::Variant.count)
@@ -31,7 +31,7 @@ describe "Ransackable Attributes" do
       variant = create(:variant, product: product)
       other_variant = create(:variant)
 
-      get "/api/variants?q[product_name_or_sku_cont]=fritos", token: user.spree_api_key
+      get "/api/variants?q[product_name_or_sku_cont]=fritos", params: { token: user.spree_api_key }
 
       skus = JSON.parse(response.body)['variants'].map { |x| x['sku'] }
       expect(skus).to include variant.sku
@@ -44,7 +44,7 @@ describe "Ransackable Attributes" do
       create(:product, description: "special product")
       create(:product)
 
-      get "/api/products?q[description_cont]=special", token: user.spree_api_key
+      get "/api/products?q[description_cont]=special", params: { token: user.spree_api_key }
 
       products_response = JSON.parse(response.body)
       expect(products_response['total_count']).to eq(Spree::Product.count)
@@ -54,7 +54,7 @@ describe "Ransackable Attributes" do
       product = create(:product)
       other_product = create(:product)
 
-      get "/api/products?q[id_eq]=#{product.id}", token: user.spree_api_key
+      get "/api/products?q[id_eq]=#{product.id}", params: { token: user.spree_api_key }
 
       product_names = JSON.parse(response.body)['products'].map { |x| x['name'] }
       expect(product_names).to include product.name
@@ -67,7 +67,7 @@ describe "Ransackable Attributes" do
       product = create(:product, name: "Fritos")
       other_product = create(:product)
 
-      get "/api/products?q[name_cont]=fritos", token: user.spree_api_key
+      get "/api/products?q[name_cont]=fritos", params: { token: user.spree_api_key }
 
       product_names = JSON.parse(response.body)['products'].map { |x| x['name'] }
       expect(product_names).to include product.name

data/spec/spec_helper.rb

@@ -36,6 +36,8 @@ require 'spree/api/testing_support/caching'
 require 'spree/api/testing_support/helpers'
 require 'spree/api/testing_support/setup'
 
+ActiveJob::Base.queue_adapter = :inline
+
 RSpec.configure do |config|
   config.backtrace_exclusion_patterns = [/gems\/activesupport/, /gems\/actionpack/, /gems\/rspec/]
   config.color = true

data/spec/support/controller_hacks.rb

@@ -25,7 +25,14 @@ module ControllerHacks
 
   def api_process(action, params = {}, session = nil, flash = nil, method = "get")
     scoping = respond_to?(:resource_scoping) ? resource_scoping : {}
-    process(action, method, params.merge(scoping).reverse_merge!(format: :json), session, flash)
+    process(
+      action,
+      method: method,
+      params: params.merge(scoping),
+      session: session,
+      flash: flash,
+      format: :json
+    )
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.4.pre1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.4.pre1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: versioncake
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +192,7 @@ files:
 - app/views/spree/api/variants/small.v1.rabl
 - app/views/spree/api/zones/index.v1.rabl
 - app/views/spree/api/zones/show.v1.rabl
+- config/initializers/rails5_rabl_hacks.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
@@ -279,12 +274,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.