Merge branch 'develop' into 'master'

Develop

See merge request gtt/redmine_supply!5

Author: dkastl

init.rb

@@ -9,7 +9,7 @@
   author 'Jens Krämer, Georepublic'
   author_url 'https://hub.georepublic.net/gtt/redmine_supply'
   description 'Add configurable supply items to issues'
-  version '1.2.0'
+  version '1.2.1'
 
   requires_redmine version_or_higher: '3.4.0'
 

lib/redmine_supply/save_supply_item.rb

@@ -23,8 +23,6 @@ def call
 
       SupplyItem.transaction do
         save_supply_item
-      rescue ActiveRecord::RecordInvalid
-        @error = $!.message
       end
 
       if @error
@@ -53,6 +51,9 @@ def save_supply_item
           old_stock: old_stock, new_stock: new_stock
         )
       end
+    rescue ActiveRecord::RecordInvalid
+      @error = $!.message
+      raise ActiveRecord::Rollback
     end
   end
 end

test/unit/save_supply_item_test.rb

@@ -14,6 +14,16 @@ class SaveSupplyItemTest < ActiveSupport::TestCase
     SupplyItem.delete_all
   end
 
+  test 'should require name' do
+    r = RedmineSupply::SaveSupplyItem.(
+      {name: '', stock: 5}, project: @project
+    )
+    refute r.supply_item_saved?, r.inspect
+    assert i = r.supply_item
+    refute i.persisted?
+    assert r.error.present?
+  end
+
   test 'should record stock change when created' do
     r = RedmineSupply::SaveSupplyItem.(
       {name: 'new item', stock: 5}, project: @project