solidus_api 2.1.0.beta1 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d202cbb2d66a818ad824e739704be52b81f63d48
-  data.tar.gz: da186de43c9f9021a1a35c5ad3b4addb89fbac5f
+  metadata.gz: a4b0bb30392fb3f98f7b70a30a7fea33fafdff51
+  data.tar.gz: 235bdb122832d0a26a76f7fe524e123bde524c54
 SHA512:
-  metadata.gz: ea88be5b89fd4e8ab09210ad1a08c8900255492134bf6e072cef9bdb0f2e610bce615f2f622f6c22be9f43fddf3a83657575845e9afc15c576f64a6bb6ac7363
-  data.tar.gz: 1e7bf9f59a65a1df20263f901cafd1793f50cabd4157ef2baf51fa94d24d586abbef35b5881ad343ce87089043360df09a4b5c5e2f98bcc378d92940c0f2fb66
+  metadata.gz: 6a6b41555532b56e6c5e500ace3c61609460762fff046d1f31002d922aeb2f18428d6b4f5f8dc6690d6cfdc4f76b159c25fd9401695a1558c3710d02b4c9e4ae
+  data.tar.gz: 64e5f7d0479aa233df96e13cb8c2b9c3420b8442b75993df038c94e52b3ab4bebfb027e2cd52f58159be8526d52853dd547cb5bac42f1c202d8a7a8f4d489110

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

@@ -8,6 +8,7 @@ module Spree
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
       include Spree::Core::ControllerHelpers::Order
+
       # TODO: Remove this after deprecated usage in #update is removed
       include Spree::Core::ControllerHelpers::PaymentParameters
 
@@ -15,12 +16,6 @@ module Spree
       skip_before_action :set_current_order
 
       def next
-        if @order.confirm?
-          Spree::Deprecation.warn "Using Spree::Api::CheckoutsController#next to transition to complete is deprecated. Please use #complete instead of #next.", caller
-          complete
-          return
-        end
-
         authorize! :update, @order, order_token
         if !expected_total_ok?(params[:expected_total])
           respond_with(@order, default_template: 'spree/api/orders/expected_total_mismatch', status: 400)
@@ -93,16 +88,6 @@ module Spree
       def massaged_params
         massaged_params = params.deep_dup
 
-        if params[:payment_source].present?
-          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?
-          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
-
         set_payment_parameters_amount(massaged_params, @order)
 
         massaged_params

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

@@ -221,30 +221,6 @@ module Spree
           expect(json_response['payments'][0]['payment_method']['name']).to eq(@payment_method.name)
           expect(json_response['payments'][0]['amount']).to eq(order.total.to_s)
         end
-
-        context 'with deprecated payment_source parameters' do
-          let(:params) do
-            {
-              id: order.to_param,
-              order_token: order.guest_token,
-              order: {
-                payments_attributes: [
-                  { payment_method_id: @payment_method.id.to_s }
-                ]
-              },
-              payment_source: { @payment_method.id.to_s => attributes_for(:credit_card) }
-            }
-          end
-
-          it "succeeds" do
-            Spree::Deprecation.silence do
-              api_put(:update, params)
-            end
-            expect(response.status).to eq(200)
-            expect(json_response['payments'][0]['payment_method']['name']).to eq(@payment_method.name)
-            expect(json_response['payments'][0]['amount']).to eq(order.total.to_s)
-          end
-        end
       end
 
       context 'when source is missing attributes' do
@@ -277,36 +253,6 @@ module Spree
           expect(cc_errors).to include("Year is not a number")
           expect(cc_errors).to include("Verification Value can't be blank")
         end
-
-        context 'with deprecated payment_source parameters' do
-          let(:params) do
-            {
-              id: order.to_param,
-              order_token: order.guest_token,
-              order: {
-                payments_attributes: [
-                  { payment_method_id: @payment_method.id.to_s }
-                ]
-              },
-              payment_source: {
-                @payment_method.id.to_s => { name: "Spree" }
-              }
-            }
-          end
-
-          it 'returns errors' do
-            Spree::Deprecation.silence do
-              api_put(:update, params)
-            end
-
-            expect(response.status).to eq(422)
-            cc_errors = json_response['errors']['payments.Credit Card']
-            expect(cc_errors).to include("Card Number can't be blank")
-            expect(cc_errors).to include("Month is not a number")
-            expect(cc_errors).to include("Year is not a number")
-            expect(cc_errors).to include("Verification Value can't be blank")
-          end
-        end
       end
 
       context 'reusing a credit card' do
@@ -348,35 +294,6 @@ module Spree
           expect(response.status).to eq 200
           expect(order.credit_cards).to match_array [credit_card]
         end
-
-        context 'with deprecated existing_card parameters' do
-          let(:params) do
-            {
-              id: order.to_param,
-              order_token: order.guest_token,
-              order: {
-                existing_card: credit_card.id.to_s
-              },
-              cvc_confirm: '456'
-            }
-          end
-
-          it 'succeeds' do
-            # unfortunately the credit card gets reloaded by `@order.next` before
-            # the controller action finishes so this is the best way I could think
-            # of to test that the verification_value gets set.
-            expect_any_instance_of(Spree::CreditCard).to(
-              receive(:verification_value=).with('456').and_call_original
-            )
-
-            Spree::Deprecation.silence do
-              api_put(:update, params)
-            end
-
-            expect(response.status).to eq 200
-            expect(order.credit_cards).to match_array [credit_card]
-          end
-        end
       end
 
       it "returns the order if the order is already complete" do
@@ -451,50 +368,40 @@ module Spree
       end
     end
 
-    # NOTE: Temporarily making "next" behave just like "complete" when order is in confirm state
-    #       Using "next" this way is deprecated.
-    [:next, :complete].each do |action|
-      context action.to_s do
-        context "with order in confirm state" do
-          subject do
-            if action == :next
-              Spree::Deprecation.silence do
-                api_put action, params
-              end
-            else
-              api_put action, params
-            end
-          end
+    context "complete" do
+      context "with order in confirm state" do
+        subject do
+          api_put :complete, params
+        end
 
-          let(:params) { { id: order.to_param, order_token: order.guest_token } }
-          let(:order) { create(:order_with_line_items) }
+        let(:params) { { id: order.to_param, order_token: order.guest_token } }
+        let(:order) { create(:order_with_line_items) }
 
-          before do
-            order.update_column(:state, "confirm")
-          end
+        before do
+          order.update_column(:state, "confirm")
+        end
 
-          it "can transition from confirm to complete" do
-            allow_any_instance_of(Spree::Order).to receive_messages(payment_required?: false)
-            subject
-            expect(json_response['state']).to eq('complete')
-            expect(response.status).to eq(200)
-          end
+        it "can transition from confirm to complete" do
+          allow_any_instance_of(Spree::Order).to receive_messages(payment_required?: false)
+          subject
+          expect(json_response['state']).to eq('complete')
+          expect(response.status).to eq(200)
+        end
 
-          it "returns a sensible error when no payment method is specified" do
-            # api_put :complete, :id => order.to_param, :order_token => order.token, :order => {}
-            subject
-            expect(json_response["errors"]["base"]).to include(Spree.t(:no_payment_found))
-          end
+        it "returns a sensible error when no payment method is specified" do
+          # api_put :complete, :id => order.to_param, :order_token => order.token, :order => {}
+          subject
+          expect(json_response["errors"]["base"]).to include(Spree.t(:no_payment_found))
+        end
 
-          context "with mismatched expected_total" do
-            let(:params) { super().merge(expected_total: order.total + 1) }
+        context "with mismatched expected_total" do
+          let(:params) { super().merge(expected_total: order.total + 1) }
 
-            it "returns an error if expected_total is present and does not match actual total" do
-              # api_put :complete, :id => order.to_param, :order_token => order.token, :expected_total => order.total + 1
-              subject
-              expect(response.status).to eq(400)
-              expect(json_response['errors']['expected_total']).to include(Spree.t(:expected_total_mismatch, scope: 'api.order'))
-            end
+          it "returns an error if expected_total is present and does not match actual total" do
+            # api_put :complete, :id => order.to_param, :order_token => order.token, :expected_total => order.total + 1
+            subject
+            expect(response.status).to eq(400)
+            expect(json_response['errors']['expected_total']).to include(Spree.t(:expected_total_mismatch, scope: 'api.order'))
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: 2.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: 2.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement