spree_backend 3.1.0.rc4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13e87f01f7607ced0b515ed357de161fe6ffe2a
-  data.tar.gz: affd41ed1d8b4334e286a524e0cf05230c75aff2
+  metadata.gz: 183de53cf05b9f4aa814b721bfb761d03c46c30f
+  data.tar.gz: aba76f689a16edec86725e6caad45dff2549931c
 SHA512:
-  metadata.gz: 1f4c701476f4303e87d9f7eded7b9667d6c1f1bcc060aec5707991c7f46b2e42089748422f66578d0c560fcf3c7da37df7c947fe6b02a8e1cce1ee21f5a0ff61
-  data.tar.gz: 69e1a1ff7288dc0a7d468fd306629a015ba638441fc610a7774f23c604f809d70193b3077eae772b24d83f5d304131f7313857ee3de2365b30185f11549c36e0
+  metadata.gz: ef7aea1bf5ab20ff81848b0c1717aa613c72d2ca2f1c4b67b522d3caa6ddfc8d831052e1067eb4de42505d17d761a050c6fc9ff42a2eda4b3a9542e575ce7a19
+  data.tar.gz: b057293b4c0ad7c0990f1717c264455cc2a6b1db7308b29cab57c34a0f205b9116255fde57139510ecf6f183420d46546fa9f16d7c9dd20f7fe69edce72b39e6

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

@@ -47,11 +47,10 @@ module Spree
 
         begin
           # TODO: why is @product.destroy raising ActiveRecord::RecordNotDestroyed instead of failing with false result
-          # Issue found for above comment: https://github.com/rails/rails/issues/19761
           if @product.destroy
             flash[:success] = Spree.t('notice_messages.product_deleted')
           else
-            flash[:error] = @object.errors.full_messages.join(', ')
+            flash[:error] = Spree.t('notice_messages.product_not_deleted')
           end
         rescue ActiveRecord::RecordNotDestroyed => e
           flash[:error] = Spree.t('notice_messages.product_not_deleted')

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

@@ -12,12 +12,12 @@ module Spree
         if @variant.destroy
           flash[:success] = Spree.t('notice_messages.variant_deleted')
         else
-          flash[:success] = Spree.t('notice_messages.variant_not_deleted')
+          flash[:error] = Spree.t('notice_messages.variant_not_deleted')
         end
 
         respond_with(@variant) do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render_js_for_destroy }
+          format.js { render_js_for_destroy }
         end
       end
 

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% if error = flash.discard(:error) %>
-  show_flash('warning', "<%= j error %>");
+  show_flash('error', "<%= j error %>");
 <% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

data/spec/controllers/spree/admin/products_controller_spec.rb

@@ -62,13 +62,10 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
 
     context 'will not successfully destroy product' do
-      let!(:error_message) { 'Test error' }
-
       before do
         allow(Spree::Product).to receive(:friendly).and_return(products)
         allow(products).to receive(:find).with(product.id.to_s).and_return(product)
         allow(product).to receive(:destroy).and_return(false)
-        allow(product).to receive_message_chain(:errors, :full_messages).and_return([error_message])
       end
 
       describe 'expects to receive' do
@@ -87,7 +84,7 @@ describe Spree::Admin::ProductsController, type: :controller do
       describe 'response' do
         before { send_request }
         it { expect(response).to have_http_status(:ok) }
-        it { expect(flash[:error]).to eq(error_message) }
+        it { expect(flash[:error]).to eq(Spree.t('notice_messages.product_not_deleted')) }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc4
+  version: 3.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-15 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.1.0.rc4
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc4
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc4
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc4
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -643,9 +643,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: spree_backend