solidus_api 1.3.2 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d04f6cc4456a153fc293ddd59af262eb561d73b8
-  data.tar.gz: b526820b388b52a98e5157fe951ea6ef4b513054
+  metadata.gz: 458c60c64203fa11109611f14f1c306f4515801d
+  data.tar.gz: 8174fd109b920284baad60c854c8a72e290ee754
 SHA512:
-  metadata.gz: a23afc17baf4b4d8c7a91c26190e687e864d07b42a40114bba65e4203464efbff6c6a4bcda307d5de80bef96fab26d4f63f4d3d9713661cb5e3acddcdf190ff0
-  data.tar.gz: 12c43e774fb74191066715d16327609888c87220119581f2bc53358b412a95c317fa277d4d4fe02b0a6aefbcd91093d5b1edba2ef2063d330d5b1a86ea0832eb
+  metadata.gz: fd71cfd47f66448c80b9d7037d62be471d059d80d818bcf8a027b25c2a5e9b660583ac8cace39b00b8278c79a6e2dca855324ce867088e86fd1fd08c28bc0fd9
+  data.tar.gz: 74bb76480dc1352a60f18ddbdae708f5d536825425993fab7832a69edf723dcd1ba108fb0e936d8f65a5b74d6a99f1553b527d10f8f953a6a7a174ed8d43691f

data/README.md

@@ -0,0 +1,13 @@
+# solidus\_api
+
+API contains controllers and rabl views implementing the REST API of solidus.
+
+## Testing
+
+Create the test site
+
+    bundle exec rake test_app
+
+Run the tests
+
+    bundle exec rake spec

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

@@ -2,7 +2,7 @@ module Spree
   module Api
     class AddressBooksController < Spree::Api::BaseController
       # Note: the AddressBook is the resource to think about here, not individual addresses
-      before_filter :load_user_addresses
+      before_action :load_user_addresses
 
       def show
         authorize! :show, address_book_user

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

@@ -1,9 +1,9 @@
 module Spree
   module Api
     class CheckoutsController < Spree::Api::BaseController
-      before_filter :load_order, only: [:next, :advance, :update, :complete]
-      around_filter :lock_order, only: [:next, :advance, :update, :complete]
-      before_filter :update_order_state, only: [:next, :advance, :update, :complete]
+      before_action :load_order, only: [:next, :advance, :update, :complete]
+      around_action :lock_order, only: [:next, :advance, :update, :complete]
+      before_action :update_order_state, only: [:next, :advance, :update, :complete]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
@@ -11,12 +11,12 @@ module Spree
       # TODO: Remove this after deprecated usage in #update is removed
       include Spree::Core::ControllerHelpers::PaymentParameters
 
-      # This before_filter comes from Spree::Core::ControllerHelpers::Order
+      # This before_action comes from Spree::Core::ControllerHelpers::Order
       skip_before_action :set_current_order
 
       def next
         if @order.confirm?
-          ActiveSupport::Deprecation.warn "Using Spree::Api::CheckoutsController#next to transition to complete is deprecated. Please use #complete instead of #next.", caller
+          Spree::Deprecation.warn "Using Spree::Api::CheckoutsController#next to transition to complete is deprecated. Please use #complete instead of #next.", caller
           complete
           return
         end
@@ -94,12 +94,12 @@ module Spree
         massaged_params = params.deep_dup
 
         if params[:payment_source].present?
-          ActiveSupport::Deprecation.warn("Passing payment_source is deprecated. Send source parameters inside payments_attributes[:source_attributes].", caller)
+          Spree::Deprecation.warn("Passing payment_source is deprecated. Send source parameters inside payments_attributes[:source_attributes].", caller)
           move_payment_source_into_payments_attributes(massaged_params)
         end
 
         if params[:order] && params[:order][:existing_card].present?
-          ActiveSupport::Deprecation.warn("Passing order[:existing_card] is deprecated. Send existing_card_id inside of payments_attributes[:source_attributes].", caller)
+          Spree::Deprecation.warn("Passing order[:existing_card] is deprecated. Send existing_card_id inside of payments_attributes[:source_attributes].", caller)
           move_existing_card_into_payments_attributes(massaged_params)
         end
 

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

@@ -11,7 +11,7 @@ module Spree
         # Because position we get back is 0-indexed.
         # acts_as_list is 1-indexed.
         classification.insert_at(params[:position].to_i + 1)
-        render nothing: true
+        head :ok
       end
     end
   end

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

@@ -5,8 +5,8 @@ module Spree
 
       self.line_item_options = []
 
-      before_filter :load_order, only: [:create, :update, :destroy]
-      around_filter :lock_order, only: [:create, :update, :destroy]
+      before_action :load_order, only: [:create, :update, :destroy]
+      around_action :lock_order, only: [:create, :update, :destroy]
 
       def new
       end

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

@@ -10,7 +10,7 @@ module Spree
       skip_before_action :authenticate_user, only: :apply_coupon_code
 
       before_action :find_order, except: [:create, :mine, :current, :index]
-      around_filter :lock_order, except: [:create, :mine, :current, :index]
+      around_action :lock_order, except: [:create, :mine, :current, :index]
 
       # Dynamically defines our stores checkout steps to ensure we check authorization on each step.
       Order.checkout_steps.keys.each do |step|
@@ -27,18 +27,8 @@ 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

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

@@ -1,9 +1,9 @@
 module Spree
   module Api
     class PaymentsController < Spree::Api::BaseController
-      before_filter :find_order
-      around_filter :lock_order, only: [:create, :update, :destroy, :authorize, :capture, :purchase, :void, :credit]
-      before_filter :find_payment, only: [:update, :show, :authorize, :purchase, :capture, :void, :credit]
+      before_action :find_order
+      around_action :lock_order, only: [:create, :update, :destroy, :authorize, :capture, :purchase, :void, :credit]
+      before_action :find_payment, only: [:update, :show, :authorize, :purchase, :capture, :void, :credit]
 
       def index
         @payments = @order.payments.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
@@ -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/app/controllers/spree/api/promotions_controller.rb

@@ -1,8 +1,8 @@
 module Spree
   module Api
     class PromotionsController < Spree::Api::BaseController
-      before_filter :requires_admin
-      before_filter :load_promotion
+      before_action :requires_admin
+      before_action :load_promotion
 
       def show
         if @promotion

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

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

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

@@ -1,11 +1,11 @@
 module Spree
   module Api
     class ShipmentsController < Spree::Api::BaseController
-      before_filter :find_order_on_create, only: :create
-      before_filter :find_shipment, only: [:update, :ship, :ready, :add, :remove]
+      before_action :find_order_on_create, only: :create
+      before_action :find_shipment, only: [:update, :ship, :ready, :add, :remove]
       before_action :load_transfer_params, only: [:transfer_to_location, :transfer_to_shipment]
-      around_filter :lock_order, except: [:mine]
-      before_filter :update_shipment, only: [:ship, :ready, :add, :remove]
+      around_action :lock_order, except: [:mine]
+      before_action :update_shipment, only: [:ship, :ready, :add, :remove]
 
       def mine
         if current_api_user
@@ -21,11 +21,6 @@ module Spree
       end
 
       def create
-        # TODO: Can remove conditional here once deprecated #find_order is removed.
-        unless @order.present?
-          @order = Spree::Order.find_by!(number: params[:shipment][:order_id])
-          authorize! :read, @order
-        end
         authorize! :create, Shipment
         quantity = params[:quantity].to_i
         @shipment = @order.shipments.create(stock_location_id: params.fetch(:stock_location_id))

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

@@ -1,7 +1,7 @@
 module Spree
   module Api
     class StockItemsController < Spree::Api::BaseController
-      before_filter :load_stock_location, only: [:index, :show, :create]
+      before_action :load_stock_location, only: [:index, :show, :create]
 
       def index
         @stock_items = scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])

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

@@ -1,7 +1,7 @@
 module Spree
   module Api
     class StoresController < Spree::Api::BaseController
-      before_filter :get_store, except: [:index, :create]
+      before_action :get_store, except: [:index, :create]
 
       def index
         authorize! :read, Store

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

@@ -33,7 +33,7 @@ module Spree
         taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
 
         if taxonomy.nil?
-          @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
+          @taxon.errors.add(:taxonomy_id, I18n.t('spree.api.invalid_taxonomy_id'))
           invalid_resource!(@taxon) && return
         end
 

data/app/helpers/spree/api/api_helpers.rb

@@ -135,7 +135,7 @@ module Spree
 
       @@adjustment_attributes = [
         :id, :source_type, :source_id, :adjustable_type, :adjustable_id,
-        :originator_type, :originator_id, :amount, :label, :promotion_code,
+        :amount, :label, :promotion_code,
         :locked, :eligible, :created_at, :updated_at
       ]
 

data/app/views/spree/api/countries/index.v1.rabl

@@ -3,5 +3,5 @@ child(@countries => :countries) do
   attributes *country_attributes
 end
 node(:count) { @countries.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @countries.current_page }
 node(:pages) { @countries.total_pages }

data/app/views/spree/api/credit_cards/index.v1.rabl

@@ -3,5 +3,5 @@ child(@credit_cards => :credit_cards) do
   extends "spree/api/credit_cards/show"
 end
 node(:count) { @credit_cards.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @credit_cards.current_page }
 node(:pages) { @credit_cards.total_pages }

data/app/views/spree/api/orders/index.v1.rabl

@@ -3,5 +3,5 @@ child(@orders => :orders) do
   extends "spree/api/orders/order"
 end
 node(:count) { @orders.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @orders.current_page }
 node(:pages) { @orders.total_pages }

data/app/views/spree/api/orders/mine.v1.rabl

@@ -5,5 +5,5 @@ child(@orders => :orders) do
 end
 
 node(:count) { @orders.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @orders.current_page }
 node(:pages) { @orders.total_pages }

data/app/views/spree/api/payments/index.v1.rabl

@@ -3,5 +3,5 @@ child(@payments => :payments) do
   attributes *payment_attributes
 end
 node(:count) { @payments.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @payments.current_page }
 node(:pages) { @payments.total_pages }

data/app/views/spree/api/product_properties/index.v1.rabl

@@ -3,5 +3,5 @@ child(@product_properties => :product_properties) do
   attributes *product_property_attributes
 end
 node(:count) { @product_properties.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @product_properties.current_page }
 node(:pages) { @product_properties.total_pages }

data/app/views/spree/api/products/index.v1.rabl

@@ -1,8 +1,8 @@
 object false
 node(:count) { @products.count }
 node(:total_count) { @products.total_count }
-node(:current_page) { params[:page] ? params[:page].to_i : 1 }
-node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
+node(:current_page) { @products.current_page }
+node(:per_page) { @products.limit_value }
 node(:pages) { @products.total_pages }
 child(@products => :products) do
   extends "spree/api/products/show"

data/app/views/spree/api/properties/index.v1.rabl

@@ -3,5 +3,5 @@ child(@properties => :properties) do
   attributes *property_attributes
 end
 node(:count) { @properties.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @properties.current_page }
 node(:pages) { @properties.total_pages }

data/app/views/spree/api/return_authorizations/index.v1.rabl

@@ -3,5 +3,5 @@ child(@return_authorizations => :return_authorizations) do
   attributes *return_authorization_attributes
 end
 node(:count) { @return_authorizations.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @return_authorizations.current_page }
 node(:pages) { @return_authorizations.total_pages }

data/app/views/spree/api/shipments/mine.v1.rabl

@@ -1,7 +1,7 @@
 object false
 
 node(:count) { @shipments.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @shipments.current_page }
 node(:pages) { @shipments.total_pages }
 
 child(@shipments => :shipments) do

data/app/views/spree/api/states/index.v1.rabl

@@ -9,6 +9,6 @@ end
 
 if @states.respond_to?(:total_pages)
   node(:count) { @states.count }
-  node(:current_page) { params[:page] || 1 }
+  node(:current_page) { @states.current_page }
   node(:pages) { @states.total_pages }
 end

data/app/views/spree/api/stock_items/index.v1.rabl

@@ -3,5 +3,5 @@ child(@stock_items => :stock_items) do
   extends 'spree/api/stock_items/show'
 end
 node(:count) { @stock_items.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @stock_items.current_page }
 node(:pages) { @stock_items.total_pages }

data/app/views/spree/api/stock_locations/index.v1.rabl

@@ -3,5 +3,5 @@ child(@stock_locations => :stock_locations) do
   extends 'spree/api/stock_locations/show'
 end
 node(:count) { @stock_locations.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @stock_locations.current_page }
 node(:pages) { @stock_locations.total_pages }

data/app/views/spree/api/stock_movements/index.v1.rabl

@@ -3,5 +3,5 @@ child(@stock_movements => :stock_movements) do
   extends 'spree/api/stock_movements/show'
 end
 node(:count) { @stock_movements.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @stock_movements.current_page }
 node(:pages) { @stock_movements.total_pages }

data/app/views/spree/api/store_credit_events/mine.v1.rabl

@@ -6,5 +6,5 @@ child(@store_credit_events => :store_credit_events) do
 end
 
 node(:count) { @store_credit_events.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @store_credit_events.current_page }
 node(:pages) { @store_credit_events.total_pages }

data/app/views/spree/api/taxonomies/index.v1.rabl

@@ -3,5 +3,5 @@ child(@taxonomies => :taxonomies) do
   extends "spree/api/taxonomies/show"
 end
 node(:count) { @taxonomies.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @taxonomies.current_page }
 node(:pages) { @taxonomies.total_pages }

data/app/views/spree/api/taxons/index.v1.rabl

@@ -1,8 +1,8 @@
 object false
 node(:count) { @taxons.count }
 node(:total_count) { @taxons.total_count }
-node(:current_page) { params[:page] ? params[:page].to_i : 1 }
-node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
+node(:current_page) { @taxons.current_page }
+node(:per_page) { @taxons.limit_value }
 node(:pages) { @taxons.total_pages }
 child @taxons => :taxons do
   attributes *taxon_attributes

data/app/views/spree/api/users/index.v1.rabl

@@ -3,5 +3,5 @@ child(@users => :users) do
   extends "spree/api/users/show"
 end
 node(:count) { @users.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @users.current_page }
 node(:pages) { @users.total_pages }

data/app/views/spree/api/variants/index.v1.rabl

@@ -1,7 +1,7 @@
 object false
 node(:count) { @variants.count }
 node(:total_count) { @variants.total_count }
-node(:current_page) { params[:page] ? params[:page].to_i : 1 }
+node(:current_page) { @variants.current_page }
 node(:pages) { @variants.total_pages }
 
 child(@variants => :variants) do

data/app/views/spree/api/zones/index.v1.rabl

@@ -3,5 +3,5 @@ child(@zones => :zones) do
   extends 'spree/api/zones/show'
 end
 node(:count) { @zones.count }
-node(:current_page) { params[:page] || 1 }
+node(:current_page) { @zones.current_page }
 node(:pages) { @zones.total_pages }

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :users do
       member do

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

@@ -37,15 +37,6 @@ module Spree
           expect(json_response['errors']['address1'].first).to eq "can't be blank"
         end
       end
-
-      it "receives the errors object if address is invalid" do
-        api_put :update, id: @address.id, order_id: @order.number,
-                         address: { address1: "" }
-
-        expect(json_response['error']).not_to be_nil
-        expect(json_response['errors']).not_to be_nil
-        expect(json_response['errors']['address1'].first).to eq "can't be blank"
-      end
     end
 
     context "on an address that does not belong to this order" do

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

@@ -143,7 +143,7 @@ describe Spree::Api::BaseController, type: :controller do
     let!(:order) { create :order }
 
     controller(Spree::Api::BaseController) do
-      around_filter :lock_order
+      around_action :lock_order
 
       def index
         render text: { "products" => [] }.to_json

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

@@ -136,7 +136,7 @@ module Spree
 
       it "can update shipping method and transition from delivery to payment" do
         order.update_column(:state, "delivery")
-        shipment = create(:shipment, order: order, address: order.ship_address)
+        shipment = create(:shipment, order: order)
         shipment.refresh_rates
         shipping_rate = shipment.shipping_rates.where(selected: false).first
         api_put :update, id: order.to_param, order_token: order.guest_token,
@@ -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,
@@ -250,7 +237,7 @@ module Spree
           end
 
           it "succeeds" do
-            ActiveSupport::Deprecation.silence do
+            Spree::Deprecation.silence do
               api_put(:update, params)
             end
             expect(response.status).to eq(200)
@@ -308,7 +295,7 @@ module Spree
           end
 
           it 'returns errors' do
-            ActiveSupport::Deprecation.silence do
+            Spree::Deprecation.silence do
               api_put(:update, params)
             end
 
@@ -382,7 +369,7 @@ module Spree
               receive(:verification_value=).with('456').and_call_original
             )
 
-            ActiveSupport::Deprecation.silence do
+            Spree::Deprecation.silence do
               api_put(:update, params)
             end
 
@@ -471,7 +458,7 @@ module Spree
         context "with order in confirm state" do
           subject do
             if action == :next
-              ActiveSupport::Deprecation.silence do
+              Spree::Deprecation.silence do
                 api_put action, params
               end
             else

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

@@ -31,7 +31,7 @@ module Spree
       it "can change the order a product" do
         classification = taxon.classifications.find_by(product_id: last_product.id)
         expect(classification.position).to eq(3)
-        api_put :update, taxon_id: taxon, product_id: last_product, position: 0
+        api_put :update, taxon_id: taxon.id, product_id: last_product.id, position: 0
         expect(response.status).to eq(200)
         expect(classification.reload.position).to eq(1)
       end
@@ -39,7 +39,7 @@ module Spree
       it "should touch the taxon" do
         taxon.update_attributes(updated_at: Time.current - 10.seconds)
         taxon_last_updated_at = taxon.updated_at
-        api_put :update, taxon_id: taxon, product_id: last_product, position: 0
+        api_put :update, taxon_id: taxon.id, product_id: last_product.id, position: 0
         taxon.reload
         expect(taxon_last_updated_at.to_i).to_not eq(taxon.updated_at.to_i)
       end

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

@@ -62,12 +62,12 @@ 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(4)
+        expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
         api_post :create,
                  line_item: {
                    variant_id: product.master.to_param,
                    quantity: 1,
-                   options: { some_option: 4 }
+                   options: { some_option: "foobar" }
                  }
         expect(response.status).to eq(201)
       end
@@ -100,11 +100,11 @@ 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(12)
+        expect_any_instance_of(LineItem).to receive(:some_option=).with("foobar")
         line_item = order.line_items.first
         api_put :update,
                 id: line_item.id,
-                line_item: { quantity: 1, options: { some_option: 12 } }
+                line_item: { quantity: 1, options: { some_option: "foobar" } }
         expect(response.status).to eq(200)
       end
 

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
@@ -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/controllers/spree/api/products_controller_spec.rb

@@ -324,7 +324,7 @@ module Spree
         end
 
         it "cannot create a new product with invalid attributes" do
-          api_post :create, product: {}
+          api_post :create, product: { foo: :bar }
           expect(response.status).to eq(422)
           expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
           errors = json_response["errors"]

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Spree::Api::ShipmentsController, type: :controller do
   render_views
-  let!(:shipment) { create(:shipment, address: create(:address), inventory_units: [build(:inventory_unit, shipment: nil)]) }
+  let!(:shipment) { create(:shipment, inventory_units: [build(:inventory_unit, shipment: nil)]) }
   let!(:attributes) { [:id, :tracking, :tracking_url, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_methods] }
 
   before do

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

@@ -24,27 +24,14 @@ module Spree
     end
 
     context "pagination" do
-      before do
-        expect(State).to receive(:accessible_by).and_return(@scope = double)
-        allow(@scope).to receive_message_chain(:ransack, :result, :includes, :order).and_return(@scope)
-      end
-
-      it "does not paginate states results when asked not to do so" do
-        expect(@scope).not_to receive(:page)
-        expect(@scope).not_to receive(:per)
-        api_get :index
-      end
-
-      it "paginates when page parameter is passed through" do
-        expect(@scope).to receive(:page).with(1).and_return(@scope)
-        expect(@scope).to receive(:per).with(nil)
-        api_get :index, page: 1
-      end
+      it "can select the next page and control page size" do
+        create(:state)
+        api_get :index, page: 2, per_page: 1
 
-      it "paginates when per_page parameter is passed through" do
-        expect(@scope).to receive(:page).with(nil).and_return(@scope)
-        expect(@scope).to receive(:per).with(25)
-        api_get :index, per_page: 25
+        expect(json_response["states"].size).to eq(1)
+        expect(json_response["pages"]).to eq(2)
+        expect(json_response["current_page"]).to eq(2)
+        expect(json_response["count"]).to eq(1)
       end
     end
 

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

@@ -147,7 +147,7 @@ module Spree
       end
 
       it "cannot create a new taxon with invalid attributes" do
-        api_post :create, taxonomy_id: taxonomy.id, taxon: {}
+        api_post :create, taxonomy_id: taxonomy.id, taxon: { foo: :bar }
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.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,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - app/controllers/spree/api/address_books_controller.rb
 - app/controllers/spree/api/addresses_controller.rb
@@ -278,12 +279,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.