Actualiza el plugin Additionals a 3.0.2-master

plugins/additionals/test/unit/additionals_info_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path '../../test_helper', __FILE__
+
+class AdditionalsInfoTest < Additionals::TestCase
+  def test_system_info
+    text = AdditionalsInfo.system_info
+    assert_not_equal '', text
+    assert_not_equal 'unknown', text
+  end
+
+  def test_windows_platform
+    assert_not AdditionalsInfo.windows_platform?
+  end
+end

plugins/additionals/test/unit/additionals_test.rb

@@ -50,10 +50,9 @@ class AdditionalsTest < Additionals::TestCase
   end
 
   def test_load_macros
-    assert_equal ['fa'], Additionals.load_macros(['fa'])
+    macros = Additionals.load_macros
 
-    assert_raises LoadError do
-      Additionals.load_macros(%w[fa invalid])
-    end
+    assert macros.count.positive?
+    assert(macros.detect { |macro| macro.include? 'fa_macro' })
   end
 end

plugins/additionals/test/unit/dashboard_test.rb

@@ -20,7 +20,7 @@ class DashboardTest < Additionals::TestCase
                               dashboard_type: DashboardContentWelcome::TYPE_NAME,
                               author_id: 2
 
-    assert dashboard.save
+    assert_save dashboard
   end
 
   def test_create_project_dashboard
@@ -29,7 +29,7 @@ class DashboardTest < Additionals::TestCase
                               project: Project.find(1),
                               author_id: 2
 
-    assert dashboard.save
+    assert_save dashboard
   end
 
   def test_do_not_create_dashboard_for_role_without_roles
@@ -48,7 +48,7 @@ class DashboardTest < Additionals::TestCase
                               visibility: Dashboard::VISIBILITY_ROLES,
                               roles: Role.where(id: [1, 3]).to_a
 
-    assert dashboard.save
+    assert_save dashboard
     dashboard.reload
 
     assert_equal [1, 3], dashboard.role_ids.sort
@@ -61,7 +61,7 @@ class DashboardTest < Additionals::TestCase
                               author_id: 2,
                               visibility: Dashboard::VISIBILITY_ROLES,
                               roles: [used_role]
-    assert dashboard.save
+    assert_save dashboard
     dashboard.reload
 
     assert_equal [used_role.id], dashboard.role_ids
@@ -82,7 +82,7 @@ class DashboardTest < Additionals::TestCase
                               system_default: true,
                               author: User.current,
                               visibility: 2
-    assert dashboard.save
+    assert_save dashboard
 
     assert dashboard.system_default
     assert_equal 2, dashboard.visibility
@@ -96,7 +96,7 @@ class DashboardTest < Additionals::TestCase
                               visibility: 2
     assert dashboard.valid?
 
-    assert dashboard.save
+    assert_save dashboard
 
     assert dashboard.system_default
     assert_equal 2, dashboard.visibility
@@ -206,7 +206,7 @@ class DashboardTest < Additionals::TestCase
     assert_equal 2, dashboard.roles.count
 
     relation = DashboardRole.new(role_id: 3, dashboard_id: dashboard.id)
-    assert relation.save
+    assert_save relation
 
     dashboard.reload
     assert_equal 3, dashboard.roles.count
@@ -217,7 +217,7 @@ class DashboardTest < Additionals::TestCase
     assert_equal 2, dashboard.roles.count
 
     dashboard.roles << Role.generate!
-    assert dashboard.save
+    assert_save dashboard
     dashboard.reload
     assert_equal 3, dashboard.roles.count
   end
@@ -228,7 +228,7 @@ class DashboardTest < Additionals::TestCase
     # change system default
     dashboard2 = dashboards :public_welcome
     dashboard2.system_default = true
-    assert dashboard2.save
+    assert_save dashboard2
 
     dashboard = dashboards :welcome_for_roles
     dashboard.reload
@@ -276,6 +276,6 @@ class DashboardTest < Additionals::TestCase
     dashboard = dashboards :private_project_default
 
     dashboard.project_id = 1
-    dashboard.save!
+    assert_save dashboard
   end
 end

plugins/additionals/test/unit/helpers/global_helper_test.rb

@@ -26,17 +26,6 @@ class GlobalHelperTest < ActionView::TestCase
     User.current = nil
   end
 
-  def test_system_info
-    text = system_info
-
-    assert_not_equal '', text
-    assert_not_equal 'unknown', text
-  end
-
-  def test_windows_platform
-    assert_nil windows_platform?
-  end
-
   def test_user_with_avatar
     html = user_with_avatar(users(:users_001))
 
@@ -65,7 +54,7 @@ class GlobalHelperTest < ActionView::TestCase
     assert_equal({ issue_id: nil, comment_id: nil },
                  parse_issue_url('', nil))
     assert_equal({ issue_id: nil, comment_id: nil },
-                 parse_issue_url('http://localhost/issues/23', nil))
+                 parse_issue_url('http://localhost/issue/23', nil))
     assert_equal({ issue_id: '23', comment_id: nil },
                  parse_issue_url('http://redmine.local/issues/23', nil))
     assert_equal({ issue_id: '23', comment_id: 2 },

plugins/additionals/test/unit/issue_test.rb

@@ -23,7 +23,7 @@ class IssueTest < Additionals::TestCase
 
   def test_create
     issue = Issue.new(project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create')
-    assert issue.save
+    assert_save issue
     assert_equal issue.tracker.default_status, issue.status
     assert_nil issue.description
   end
@@ -33,7 +33,7 @@ class IssueTest < Additionals::TestCase
       User.current = users :users_003
       issue = issues :issues_007
       issue.subject = 'Should be be saved'
-      assert issue.save
+      assert_save issue
     end
   end
 
@@ -48,7 +48,7 @@ class IssueTest < Additionals::TestCase
       issue = issues :issues_008
 
       issue.subject = 'Should be saved'
-      assert issue.save
+      assert_save issue
 
       issue.reload
       assert_equal 'Should be saved', issue.subject
@@ -79,11 +79,11 @@ class IssueTest < Additionals::TestCase
 
       issue = Issue.generate subject: 'new issue for closing test',
                              status_id: 1
-      assert issue.save
+      assert_save issue
 
       issue = Issue.generate subject: 'new issue for closing test and closed state',
                              status_id: 5
-      assert issue.save
+      assert_save issue
     end
   end
 
@@ -93,7 +93,7 @@ class IssueTest < Additionals::TestCase
       issue = issues :issues_008
 
       issue.subject = 'Should be saved'
-      assert issue.save
+      assert_save issue
 
       issue.reload
       assert_equal 'Should be saved', issue.subject
@@ -104,7 +104,7 @@ class IssueTest < Additionals::TestCase
     with_additionals_settings issue_freezed_with_close: 1 do
       User.current = users :users_003
       issue = issues :issues_008
-      assert issue.save
+      assert_save issue
 
       # but changed issues should throw error
       issue.subject = 'changed'
@@ -117,7 +117,7 @@ class IssueTest < Additionals::TestCase
                               issue_auto_assign_status: ['1'],
                               issue_auto_assign_role: '1' do
       issue = Issue.new(project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create')
-      assert issue.save
+      assert_save issue
       assert_equal 2, issue.assigned_to_id
     end
   end
@@ -127,7 +127,7 @@ class IssueTest < Additionals::TestCase
                               issue_auto_assign_status: ['1'],
                               issue_auto_assign_role: '1' do
       issue = Issue.new(project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create')
-      assert issue.save
+      assert_save issue
       assert_nil issue.assigned_to_id
     end
 
@@ -135,7 +135,7 @@ class IssueTest < Additionals::TestCase
                               issue_auto_assign_status: [],
                               issue_auto_assign_role: '1' do
       issue = Issue.new(project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create')
-      assert issue.save
+      assert_save issue
       assert_nil issue.assigned_to_id
     end
 
@@ -143,7 +143,7 @@ class IssueTest < Additionals::TestCase
                               issue_auto_assign_status: ['1'],
                               issue_auto_assign_role: '' do
       issue = Issue.new(project_id: 1, tracker_id: 1, author_id: 3, subject: 'test_create')
-      assert issue.save
+      assert_save issue
       assert_nil issue.assigned_to_id
     end
   end

plugins/additionals/test/unit/role_test.rb

@@ -12,13 +12,13 @@ class RoleTest < Additionals::TestCase
 
   def test_with_permission
     role = Role.new(name: 'role without hide')
-    assert role.save
+    assert_save role
 
     role.reload
     assert_not role.hide
 
     role = Role.new(name: 'role with hide', hide: true)
-    assert role.save
+    assert_save role
 
     role.reload
     assert role.hide
@@ -27,7 +27,7 @@ class RoleTest < Additionals::TestCase
   def test_edit
     role = roles(:roles_001)
     role.hide = true
-    assert role.save
+    assert_save role
 
     role.reload
     assert role.hide

plugins/additionals/test/unit/time_entry_test.rb

@@ -22,14 +22,14 @@ class TimeEntryTest < Additionals::TestCase
   def test_create_time_entry_without_issue
     entry = TimeEntry.generate(project: projects(:projects_001))
     assert entry.valid?
-    assert entry.save
+    assert_save entry
   end
 
   def test_create_time_entry_with_open_issue
     entry = TimeEntry.generate(issue: issues(:issues_002))
     assert_not entry.issue.closed?
     assert entry.valid?
-    assert entry.save
+    assert_save entry
   end
 
   def test_create_time_entry_with_closed_issue_without_permission
@@ -51,6 +51,6 @@ class TimeEntryTest < Additionals::TestCase
     entry = TimeEntry.generate(issue: issues(:issues_008))
     assert entry.issue.closed?
     assert entry.valid?
-    assert entry.save
+    assert_save entry
   end
 end