solidus_api 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c27f1cbd12fbfc2f1588265d427fda10aac79dc
-  data.tar.gz: 33689199fb8f385a903645829f0b2805448dc2b9
+  metadata.gz: 9bf090ca7d6dce9405c4514004a088dffe253498
+  data.tar.gz: 59d40cff4dc3259b807d908b0cb3b8f23c74561d
 SHA512:
-  metadata.gz: 9430517a04af0a859a55e627496791184b50177b0f7b4a93138e81ec448b87b21e646b0f297186fd5d548ec52f79ea6ceee724f1bbb8aad5304deec061804567
-  data.tar.gz: 84d6992a692b32f60c2776019869088db6d78ab1a694ea5469cd4a87c931a2db6166241a322bbe5cb955266a48416b27885a33b5dd30da389766bdb7c82da374
+  metadata.gz: 1d6706de3c8ca25c4b136b531198faa318011731298ce37826f0ad9ee9c0ed869f579666c73966ae3b69c95fce7e163cddcdea33970ae06ddc89c869db83f02f
+  data.tar.gz: 6caefd25b36f1e933ec25597c565243fafc00c821100e4481a384fd12351783bfff379cd2e067c7c0f6d2f8a02f33247e4be10dd5d4aba9cf09f2894c29d1bb0

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

@@ -27,8 +27,18 @@ module Spree
 
       def create
         authorize! :create, Order
-        @order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
-        respond_with(@order, default_template: :show, status: 201)
+
+        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
       end
 
       def empty

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

@@ -16,6 +16,7 @@ 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/spec/controllers/spree/api/checkouts_controller_spec.rb

@@ -163,6 +163,19 @@ 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!(available_to_users: false)
+          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,8 +32,9 @@ 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: { user_id: target_user.id, created_at: date_override, email: target_user.email } }
+      subject { api_post :create, order: attributes }
 
       context "when the current user cannot administrate the order" do
         stub_authorization! do |_|
@@ -42,12 +43,37 @@ 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", available_to_users: false) }
+            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
@@ -97,6 +123,30 @@ 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", available_to_users: false) }
+            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
@@ -333,10 +383,7 @@ module Spree
 
     # Regression test for https://github.com/spree/spree/issues/3404
     it "can specify additional parameters for a line item" do
-      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"))
+      expect_any_instance_of(Spree::LineItem).to receive(:special=).with("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,6 +45,17 @@ 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!(available_to_users: false)
+
+              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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-12-12 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.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement