spree_backend 3.2.0.rc1 → 3.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a9f7de48919e990d609ddf3fb74255c00c6a4c2
-  data.tar.gz: dc522ba30d7641a682f0a6f33c028f224a06c3ba
+  metadata.gz: e8fb294832daffce21e70c27bc12b834957be005
+  data.tar.gz: de6c2e47bd64bafa45164025bc2fa7b8d67de16c
 SHA512:
-  metadata.gz: f9ff1ad9d293d181c874f8e4378227b4cee241097d8f0e6d97c081d1b24064b5ecd9ff3c2d009f2a2ae2504f914a2d3f1ba287b677642d7a7c42e54f2725d5fe
-  data.tar.gz: e83dc490934970ee0f8711cd9dccd2adaffb6e29398045453ec7cfa7e305fcb5c8cc8e7d98bf1b1fe33386c6147327965cb620e03be49f64bbc4cd21c51da909
+  metadata.gz: af578629a32a95bbebda8d4058545258c453186d586b2a8ff67f67098f6abc1449687461e24d1d2f13c9e95952e8fc44164b95a8923082556199e75db493bc6c
+  data.tar.gz: 3480bae6bcb82f2d136bfaeaa346679f94428eea38240b5b5de3a6b7c03ee7071a25ede2cb3e1865ecfaa55492f8ac7084cceb276ec7420bbed04c2f33db17f8

data/app/controllers/spree/admin/products_controller.rb

@@ -105,7 +105,7 @@ module Spree
         return @collection if @collection.present?
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= "1"
-        params[:q][:discontinue_on_null] ||= "1"
+        params[:q][:not_discontinued] ||= "1"
 
         params[:q][:s] ||= "name asc"
         @collection = super

data/app/views/spree/admin/products/index.html.erb

@@ -34,7 +34,7 @@
 
           <div class="field checkbox">
             <label>
-              <%= f.check_box :discontinue_on_null, {checked: params[:q][:discontinue_on_null] == '0'}, '0', '1' %>
+              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
               <%= Spree.t(:show_discontinued ) %>
             </label>
           </div>

data/spec/features/admin/promotions/adjustments_spec.rb

@@ -139,31 +139,30 @@ describe "Promotion Adjustments", type: :feature, js: true do
       expect(first_action_calculator.preferred_percent).to eq(10)
     end
 
-    xit "should allow an admin to create an automatic promotion with free shipping (no code)" do
+    it "should allow an admin to create an automatic promotion with free shipping (no code)" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+
+      promotion = Spree::Promotion.find_by_name("Promotion")
+      expect(page).to have_content(promotion.name)
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
-      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount", with: "30"
+      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_min", with: "50"
+      eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_max", with: "150"
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
+      select2 "Free shipping", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Free Shipping", from: "Calculator"
-      within('#actions_container') { click_button "Update" }
+      expect(page).to have_content("Makes all shipments for the order free")
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.code).to be_blank
 
       first_rule = promotion.rules.first
       expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
 
       first_action = promotion.actions.first
-      expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
-      first_action_calculator = first_action.calculator
-      expect(first_action_calculator.class).to eq(Spree::Calculator::FreeShipping)
+      expect(first_action.class).to eq(Spree::Promotion::Actions::FreeShipping)
     end
 
     it "should allow an admin to create an automatic promo requiring a landing page to be visited" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
+  version: 3.2.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+        version: 3.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement