solidus_api 2.5.0.beta1 → 2.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f786be0873e048ce3be477e79b3e77fea2edc7b831abddcff8910b353ec8180
-  data.tar.gz: 78a37e6abfb77386b5fac0c0465c590337bb23d6ba930fc146583e8bad473195
+  metadata.gz: 0dbdb8e473ea54bf3df9c52158b5a0fc98fc112766f69b397f2aa9f164f94308
+  data.tar.gz: d6662c9adea6b3201733832fdd6c6b678a70c6a8269fe3f157cb3451012dc8cc
 SHA512:
-  metadata.gz: 6ba8a8df12bdb893791882ab855ca8912163ce0c9bf750effe7d1b46ab6ff1b0bff0ee64f787fa317c9047db2db89f4d92fa3ef6c403f4c1e1bb989123770d0c
-  data.tar.gz: 6c2f3890c3dfa009f3d1607b648d3109b26be3a52209a492b7162ca985633e79ff6ad0b3189c72dbcbf3d5ae62cfefcfabfddfb15b39235a637fca596eb7b765
+  metadata.gz: 965c47bae04883ac829ceb048b18328b85d7be04ba70187a1c824bed38f374cbaa279b4f11dc1037a68730c11bb4ea9de4272004c18a3be9eb46c2dddb9eabc3
+  data.tar.gz: 0d9de4dce48e7b3713f1d0ebca272d3993dbd4b7624bb50f2553ab0902603d79952a54c0fe7732b0bfc00b4a16d9e3682f1c12e79a1f74cd9f7694690944d96c

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

@@ -33,7 +33,7 @@ module Spree
           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
+          if @order.contents.update_cart order_params
             respond_with(@order, default_template: :show, status: 201)
           else
             invalid_resource!(@order)

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

@@ -76,6 +76,20 @@ module Spree
             end
           end
         end
+
+        context "with existing promotion" do
+          let(:discount) { 2 }
+          before do
+            create(:promotion, :with_line_item_adjustment, apply_automatically: true, adjustment_rate: discount )
+          end
+
+          it "activates the promotion" do
+            post spree.api_orders_path, params: { order: { line_items: { "0" => { variant_id: variant.to_param, quantity: 1 } } } }
+            order = Order.last
+            line_item = order.line_items.first
+            expect(order.total).to eq(line_item.price - discount)
+          end
+        end
       end
 
       context "when the current user can administrate the order" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta1
+  version: 2.5.0.beta2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-20 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.5.0.beta1
+        version: 2.5.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0.beta1
+        version: 2.5.0.beta2
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.