spree_backend 3.1.0.rc4 → 3.1.0

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/products_controller.rb +1 -2
  3. data/app/controllers/spree/admin/variants_controller.rb +2 -2
  4. data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
  5. data/spec/controllers/spree/admin/products_controller_spec.rb +1 -4
  6. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b13e87f01f7607ced0b515ed357de161fe6ffe2a
4
- data.tar.gz: affd41ed1d8b4334e286a524e0cf05230c75aff2
3
+ metadata.gz: 183de53cf05b9f4aa814b721bfb761d03c46c30f
4
+ data.tar.gz: aba76f689a16edec86725e6caad45dff2549931c
5
5
  SHA512:
6
- metadata.gz: 1f4c701476f4303e87d9f7eded7b9667d6c1f1bcc060aec5707991c7f46b2e42089748422f66578d0c560fcf3c7da37df7c947fe6b02a8e1cce1ee21f5a0ff61
7
- data.tar.gz: 69e1a1ff7288dc0a7d468fd306629a015ba638441fc610a7774f23c604f809d70193b3077eae772b24d83f5d304131f7313857ee3de2365b30185f11549c36e0
6
+ metadata.gz: ef7aea1bf5ab20ff81848b0c1717aa613c72d2ca2f1c4b67b522d3caa6ddfc8d831052e1067eb4de42505d17d761a050c6fc9ff42a2eda4b3a9542e575ce7a19
7
+ data.tar.gz: b057293b4c0ad7c0990f1717c264455cc2a6b1db7308b29cab57c34a0f205b9116255fde57139510ecf6f183420d46546fa9f16d7c9dd20f7fe69edce72b39e6
data/app/controllers/spree/admin/products_controller.rb CHANGED
@@ -47,11 +47,10 @@ module Spree
47
47
 
48
48
  begin
49
49
  # TODO: why is @product.destroy raising ActiveRecord::RecordNotDestroyed instead of failing with false result
50
- # Issue found for above comment: https://github.com/rails/rails/issues/19761
51
50
  if @product.destroy
52
51
  flash[:success] = Spree.t('notice_messages.product_deleted')
53
52
  else
54
- flash[:error] = @object.errors.full_messages.join(', ')
53
+ flash[:error] = Spree.t('notice_messages.product_not_deleted')
55
54
  end
56
55
  rescue ActiveRecord::RecordNotDestroyed => e
57
56
  flash[:error] = Spree.t('notice_messages.product_not_deleted')
data/app/controllers/spree/admin/variants_controller.rb CHANGED
@@ -12,12 +12,12 @@ module Spree
12
12
  if @variant.destroy
13
13
  flash[:success] = Spree.t('notice_messages.variant_deleted')
14
14
  else
15
- flash[:success] = Spree.t('notice_messages.variant_not_deleted')
15
+ flash[:error] = Spree.t('notice_messages.variant_not_deleted')
16
16
  end
17
17
 
18
18
  respond_with(@variant) do |format|
19
19
  format.html { redirect_to admin_product_variants_url(params[:product_id]) }
20
- format.js { render_js_for_destroy }
20
+ format.js { render_js_for_destroy }
21
21
  end
22
22
  end
23
23
 
data/app/views/spree/admin/shared/_destroy.js.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <% end %>
4
4
 
5
5
  <% if error = flash.discard(:error) %>
6
- show_flash('warning', "<%= j error %>");
6
+ show_flash('error', "<%= j error %>");
7
7
  <% end %>
8
8
 
9
9
  <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>
data/spec/controllers/spree/admin/products_controller_spec.rb CHANGED
@@ -62,13 +62,10 @@ describe Spree::Admin::ProductsController, type: :controller do
62
62
  end
63
63
 
64
64
  context 'will not successfully destroy product' do
65
- let!(:error_message) { 'Test error' }
66
-
67
65
  before do
68
66
  allow(Spree::Product).to receive(:friendly).and_return(products)
69
67
  allow(products).to receive(:find).with(product.id.to_s).and_return(product)
70
68
  allow(product).to receive(:destroy).and_return(false)
71
- allow(product).to receive_message_chain(:errors, :full_messages).and_return([error_message])
72
69
  end
73
70
 
74
71
  describe 'expects to receive' do
@@ -87,7 +84,7 @@ describe Spree::Admin::ProductsController, type: :controller do
87
84
  describe 'response' do
88
85
  before { send_request }
89
86
  it { expect(response).to have_http_status(:ok) }
90
- it { expect(flash[:error]).to eq(error_message) }
87
+ it { expect(flash[:error]).to eq(Spree.t('notice_messages.product_not_deleted')) }
91
88
  end
92
89
  end
93
90
  end
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.1.0.rc4
4
+ version: 3.1.0
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-06-13 00:00:00.000000000 Z
11
+ date: 2016-06-15 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.1.0.rc4
19
+ version: 3.1.0
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.1.0.rc4
26
+ version: 3.1.0
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.1.0.rc4
33
+ version: 3.1.0
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.1.0.rc4
40
+ version: 3.1.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -643,9 +643,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
643
643
  version: '0'
644
644
  required_rubygems_version: !ruby/object:Gem::Requirement
645
645
  requirements:
646
- - - ">"
646
+ - - ">="
647
647
  - !ruby/object:Gem::Version
648
- version: 1.3.1
648
+ version: '0'
649
649
  requirements:
650
650
  - none
651
651
  rubyforge_project: spree_backend