spree_backend 3.2.0.rc1 → 3.2.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/products_controller.rb +1 -1
  3. data/app/views/spree/admin/products/index.html.erb +1 -1
  4. data/spec/features/admin/promotions/adjustments_spec.rb +9 -10
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6a9f7de48919e990d609ddf3fb74255c00c6a4c2
4
- data.tar.gz: dc522ba30d7641a682f0a6f33c028f224a06c3ba
3
+ metadata.gz: e8fb294832daffce21e70c27bc12b834957be005
4
+ data.tar.gz: de6c2e47bd64bafa45164025bc2fa7b8d67de16c
5
5
  SHA512:
6
- metadata.gz: f9ff1ad9d293d181c874f8e4378227b4cee241097d8f0e6d97c081d1b24064b5ecd9ff3c2d009f2a2ae2504f914a2d3f1ba287b677642d7a7c42e54f2725d5fe
7
- data.tar.gz: e83dc490934970ee0f8711cd9dccd2adaffb6e29398045453ec7cfa7e305fcb5c8cc8e7d98bf1b1fe33386c6147327965cb620e03be49f64bbc4cd21c51da909
6
+ metadata.gz: af578629a32a95bbebda8d4058545258c453186d586b2a8ff67f67098f6abc1449687461e24d1d2f13c9e95952e8fc44164b95a8923082556199e75db493bc6c
7
+ data.tar.gz: 3480bae6bcb82f2d136bfaeaa346679f94428eea38240b5b5de3a6b7c03ee7071a25ede2cb3e1865ecfaa55492f8ac7084cceb276ec7420bbed04c2f33db17f8
data/app/controllers/spree/admin/products_controller.rb CHANGED
@@ -105,7 +105,7 @@ module Spree
105
105
  return @collection if @collection.present?
106
106
  params[:q] ||= {}
107
107
  params[:q][:deleted_at_null] ||= "1"
108
- params[:q][:discontinue_on_null] ||= "1"
108
+ params[:q][:not_discontinued] ||= "1"
109
109
 
110
110
  params[:q][:s] ||= "name asc"
111
111
  @collection = super
data/app/views/spree/admin/products/index.html.erb CHANGED
@@ -34,7 +34,7 @@
34
34
 
35
35
  <div class="field checkbox">
36
36
  <label>
37
- <%= f.check_box :discontinue_on_null, {checked: params[:q][:discontinue_on_null] == '0'}, '0', '1' %>
37
+ <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
38
38
  <%= Spree.t(:show_discontinued ) %>
39
39
  </label>
40
40
  </div>
data/spec/features/admin/promotions/adjustments_spec.rb CHANGED
@@ -139,31 +139,30 @@ describe "Promotion Adjustments", type: :feature, js: true do
139
139
  expect(first_action_calculator.preferred_percent).to eq(10)
140
140
  end
141
141
 
142
- xit "should allow an admin to create an automatic promotion with free shipping (no code)" do
142
+ it "should allow an admin to create an automatic promotion with free shipping (no code)" do
143
143
  fill_in "Name", with: "Promotion"
144
144
  click_button "Create"
145
- expect(page).to have_content("Editing Promotion")
145
+
146
+ promotion = Spree::Promotion.find_by_name("Promotion")
147
+ expect(page).to have_content(promotion.name)
146
148
 
147
149
  select2 "Item total", from: "Add rule of type"
148
150
  within('#rule_fields') { click_button "Add" }
149
- eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount", with: "30"
151
+ eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_min", with: "50"
152
+ eventually_fill_in "promotion_promotion_rules_attributes_1_preferred_amount_max", with: "150"
150
153
  within('#rule_fields') { click_button "Update" }
151
154
 
152
- select2 "Create whole-order adjustment", from: "Add action of type"
155
+ select2 "Free shipping", from: "Add action of type"
153
156
  within('#action_fields') { click_button "Add" }
154
- select2 "Free Shipping", from: "Calculator"
155
- within('#actions_container') { click_button "Update" }
157
+ expect(page).to have_content("Makes all shipments for the order free")
156
158
 
157
- promotion = Spree::Promotion.find_by_name("Promotion")
158
159
  expect(promotion.code).to be_blank
159
160
 
160
161
  first_rule = promotion.rules.first
161
162
  expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
162
163
 
163
164
  first_action = promotion.actions.first
164
- expect(first_action.class).to eq(Spree::Promotion::Actions::CreateAdjustment)
165
- first_action_calculator = first_action.calculator
166
- expect(first_action_calculator.class).to eq(Spree::Calculator::FreeShipping)
165
+ expect(first_action.class).to eq(Spree::Promotion::Actions::FreeShipping)
167
166
  end
168
167
 
169
168
  it "should allow an admin to create an automatic promo requiring a landing page to be visited" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0.rc1
4
+ version: 3.2.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-07 00:00:00.000000000 Z
11
+ date: 2016-12-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.0.rc1
19
+ version: 3.2.0.rc2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.2.0.rc1
26
+ version: 3.2.0.rc2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.2.0.rc1
33
+ version: 3.2.0.rc2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.2.0.rc1
40
+ version: 3.2.0.rc2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement