More test fixed for redmine 4

test/controllers

@@ -1 +0,0 @@
-functional

test/functional/account_controller_test.rb

@@ -9,26 +9,24 @@ class AccountControllerTest < Additionals::ControllerTest
   end
 
   def test_get_login_with_welcome_text
-    with_additionals_settings(account_login_bottom: 'Lore impsuum')
+    with_additionals_settings(account_login_bottom: 'Lore impsuum') do
-
       get :login
       assert_response :success
-
       assert_select 'input[name=username]'
       assert_select 'input[name=password]'
       assert_select 'div.login-additionals', text: /Lore impsuum/
     end
+  end
 
   def test_get_login_without_welcome_text
-    with_additionals_settings(account_login_bottom: '')
+    with_additionals_settings(account_login_bottom: '') do
-
       get :login
       assert_response :success
-
       assert_select 'input[name=username]'
       assert_select 'input[name=password]'
       assert_select 'div.login-additionals', count: 0
     end
+  end
 
   # See integration/account_test.rb for the full test
   def test_post_register_with_registration_on

test/functional/issues_controller_test.rb

@@ -86,42 +86,47 @@ class IssuesControllerTest < Additionals::ControllerTest
   end
 
   test 'show assign-to-me on issue' do
-    with_additionals_settings(issue_assign_to_me: 1)
+    with_additionals_settings(issue_assign_to_me: 1) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'a.assign-to-me'
     end
+  end
 
   test 'don\'t show assign-to-me on issue without activation' do
-    with_additionals_settings(issue_assign_to_me: 0)
+    with_additionals_settings(issue_assign_to_me: 0) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'a.assign-to-me', count: 0
     end
+  end
 
   test 'don\'t show assign-to-me on issue with already assigned_to me' do
-    with_additionals_settings(issue_assign_to_me: 1)
+    with_additionals_settings(issue_assign_to_me: 1) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 4 }
       assert_select 'a.assign-to-me', count: 0
     end
+  end
 
   test 'show change status in issue sidebar' do
-    with_additionals_settings(issue_change_status_in_sidebar: 1)
+    with_additionals_settings(issue_change_status_in_sidebar: 1) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'ul.issue-status-change-sidebar'
     end
+  end
 
   test 'don\'t show change status in issue sidebar without activation' do
-    with_additionals_settings(issue_change_status_in_sidebar: 0)
+    with_additionals_settings(issue_change_status_in_sidebar: 0) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'ul.issue-status-change-sidebar', count: 0
     end
+  end
 end

test/functional/projects_controller_test.rb

@@ -20,7 +20,7 @@ class ProjectsControllerTest < Additionals::ControllerTest
   end
 
   def test_show_overview_content
-    with_additionals_settings(project_overview_content: 'Lore impsuum')
+    with_additionals_settings(project_overview_content: 'Lore impsuum') do
       @request.session[:user_id] = 4
       get :show,
           params: { id: 1 }
@@ -28,9 +28,10 @@ class ProjectsControllerTest < Additionals::ControllerTest
       assert_response :success
       assert_select 'div.project-content', text: /Lore impsuum/
     end
+  end
 
   def test_do_not_show_overview_content_box
-    with_additionals_settings(project_overview_content: '')
+    with_additionals_settings(project_overview_content: '') do
       @request.session[:user_id] = 4
       get :show,
           params: { id: 1 }
@@ -38,4 +39,5 @@ class ProjectsControllerTest < Additionals::ControllerTest
       assert_response :success
       assert_select 'div.project-content', count: 0
     end
+  end
 end

test/functional/users_controller_test.rb

@@ -23,18 +23,20 @@ class UsersControllerTest < Additionals::ControllerTest
   end
 
   def test_show_new_issue_on_profile
-    with_additionals_settings(new_issue_on_profile: 1)
+    with_additionals_settings(new_issue_on_profile: 1) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'a.user-new-issue'
     end
+  end
 
   def test_not_show_new_issue_on_profile_without_activated
-    with_additionals_settings(new_issue_on_profile: 0)
+    with_additionals_settings(new_issue_on_profile: 0) do
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
       assert_select 'a.user-new-issue', count: 0
     end
+  end
 end

test/functional/welcome_controller_test.rb

@@ -9,56 +9,62 @@ class WelcomeControllerTest < Additionals::ControllerTest
   end
 
   def test_show_with_overview_right
-    with_additionals_settings(overview_right: 'Lore impsuum')
+    with_additionals_settings(overview_right: 'Lore impsuum') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-right', text: /Lore impsuum/
     end
+  end
 
   def test_show_without_overview_right
-    with_additionals_settings(overview_right: '')
+    with_additionals_settings(overview_right: '') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-right', count: 0
     end
+  end
 
   def test_show_with_overview_bottom
-    with_additionals_settings(overview_bottom: 'Lore impsuum')
+    with_additionals_settings(overview_bottom: 'Lore impsuum') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-bottom', text: /Lore impsuum/
     end
+  end
 
   def test_show_without_overview_bottom
-    with_additionals_settings(overview_bottom: '')
+    with_additionals_settings(overview_bottom: '') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-bottom', count: 0
     end
+  end
 
   def test_show_with_overview_top
-    with_additionals_settings(overview_top: 'Lore impsuum')
+    with_additionals_settings(overview_top: 'Lore impsuum') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-top', text: /Lore impsuum/
     end
+  end
 
   def test_show_without_overview_top
-    with_additionals_settings(overview_top: '')
+    with_additionals_settings(overview_top: '') do
       @request.session[:user_id] = 4
       get :index
 
       assert_response :success
       assert_select 'div.overview-top', count: 0
     end
+  end
 end

test/functional/wiki_controller_test.rb

@@ -368,42 +368,42 @@ class WikiControllerTest < Additionals::ControllerTest
   end
 
   def test_show_wiki_with_header
-    with_additionals_settings(global_wiki_header: 'Lore impsuum')
+    with_additionals_settings(global_wiki_header: 'Lore impsuum') do
-
       get :show,
           params: { project_id: 1, id: 'Another_page' }
 
       assert_response :success
       assert_select 'div#wiki_extentions_header', text: /Lore impsuum/
     end
+  end
 
   def test_show_wiki_without_header
-    with_additionals_settings(global_wiki_header: '')
+    with_additionals_settings(global_wiki_header: '') do
-
       get :show,
           params: { project_id: 1, id: 'Another_page' }
 
       assert_response :success
       assert_select 'div#wiki_extentions_header', count: 0
     end
+  end
 
   def test_show_wiki_with_footer
-    with_additionals_settings(global_wiki_footer: 'Lore impsuum')
+    with_additionals_settings(global_wiki_footer: 'Lore impsuum') do
-
       get :show,
           params: { project_id: 1, id: 'Another_page' }
 
       assert_response :success
       assert_select 'div#wiki_extentions_footer', text: /Lore impsuum/
     end
+  end
 
   def test_show_wiki_without_footer
-    with_additionals_settings(global_wiki_footer: '')
+    with_additionals_settings(global_wiki_footer: '') do
-
       get :show,
           params: { project_id: 1, id: 'Another_page' }
 
       assert_response :success
       assert_select 'div#wiki_extentions_footer', count: 0
     end
+  end
 end

test/integration/api_test/issues_test.rb

@@ -42,8 +42,7 @@ module ApiTest
       with_additionals_settings(issue_status_change: '0',
                                 issue_auto_assign: '0',
                                 issue_auto_assign_status: ['1'],
-                                issue_auto_assign_role: '1')
+                                issue_auto_assign_role: '1') do
-
         payload = <<-XML
         <?xml version="1.0" encoding="UTF-8" ?>
         <issue>
@@ -68,13 +67,13 @@ module ApiTest
         assert_equal 'application/xml', @response.content_type
         assert_select 'issue > id', text: issue.id.to_s
       end
+    end
 
     test 'POST /issues.xml should create an issue with auto assigned_to_id' do
       with_additionals_settings(issue_status_change: '0',
                                 issue_auto_assign: '1',
                                 issue_auto_assign_status: ['1'],
-                                issue_auto_assign_role: '1')
+                                issue_auto_assign_role: '1') do
-
         payload = <<-XML
         <?xml version="1.0" encoding="UTF-8" ?>
         <issue>
@@ -98,6 +97,7 @@ module ApiTest
         assert_equal 'application/xml', @response.content_type
         assert_select 'issue > id', text: issue.id.to_s
       end
+    end
 
     test 'DELETE /issues/:id.xml' do
       assert_difference('Issue.count', -1) do

test/test_helper.rb

@@ -17,8 +17,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper')
 
 module Additionals
   module TestHelper
-    def with_additionals_settings(settings)
+    def with_additionals_settings(settings, &_block)
       Additionals.change_settings = settings
+      yield
+    ensure
+      Additionals.change_settings = Setting[:plugin_additionals]
     end
   end
 

test/unit/issue_test.rb

@@ -67,21 +67,21 @@ class IssueTest < ActiveSupport::TestCase
     with_additionals_settings(issue_status_change: '0',
                               issue_auto_assign: '1',
                               issue_auto_assign_status: ['1'],
-                              issue_auto_assign_role: '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_equal 2, issue.assigned_to_id
     end
+  end
 
   def test_disabled_auto_assigned_to
     with_additionals_settings(issue_status_change: '0',
                               issue_auto_assign: '0',
                               issue_auto_assign_status: ['1'],
-                              issue_auto_assign_role: '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_nil issue.assigned_to_id
     end
+  end
 end

test/unit/watcher_test.rb

@@ -11,19 +11,20 @@ class WatcherTest < ActiveSupport::TestCase
     @author = User.find(1)
     @assigned_user = User.find(2)
     @changing_user = User.find(4)
-    with_additionals_settings(issue_autowatch_involved: 1)
   end
 
   def test_new_issue_with_no_autowatch
-    with_additionals_settings(issue_autowatch_involved: 0)
+    with_additionals_settings(issue_autowatch_involved: 0) do
       User.current = @author
       issue = Issue.generate(author_id: @author.id)
       issue.save
       assert_equal 0, issue.watchers.count
       assert_not issue.watched_by?(@author)
     end
+  end
 
   def test_new_issue_with_no_autowatch_by_user
+    with_additionals_settings(issue_autowatch_involved: 1) do
       User.current = @author
       User.current.pref.update_attribute :autowatch_involved_issue, false
 
@@ -32,16 +33,20 @@ class WatcherTest < ActiveSupport::TestCase
       assert_equal 0, issue.watchers.count
       assert_not issue.watched_by?(@author)
     end
+  end
 
   def test_new_issue_with_author_watch_only
+    with_additionals_settings(issue_autowatch_involved: 1) do
       User.current = @author
       issue = Issue.generate(author_id: @author.id)
       issue.save
       assert_equal 1, issue.watchers.count
       assert issue.watched_by?(@author)
     end
+  end
 
   def test_new_issue_with_author_and_assigned_to_watchers
+    with_additionals_settings(issue_autowatch_involved: 1) do
       User.current = @author
       issue = Issue.generate(author_id: @author.id, assigned_to: @assigned_user)
       issue.save
@@ -50,8 +55,10 @@ class WatcherTest < ActiveSupport::TestCase
       assert issue.watched_by?(@author)
       assert issue.watched_by?(@assigned_user)
     end
+  end
 
   def test_issue_do_not_add_author_with_user_change
+    with_additionals_settings(issue_autowatch_involved: 1) do
       User.current = @author
 
       issue = Issue.generate(author_id: @author.id, assigned_to: @assigned_user)
@@ -70,8 +77,10 @@ class WatcherTest < ActiveSupport::TestCase
       assert issue.watched_by?(@changing_user)
       assert issue.watched_by?(@assigned_user)
     end
+  end
 
   def test_issue_do_not_add_assigned_to_with_user_change
+    with_additionals_settings(issue_autowatch_involved: 1) do
       User.current = @author
 
       issue = Issue.generate(author_id: @author.id, assigned_to: @assigned_user)
@@ -90,4 +99,5 @@ class WatcherTest < ActiveSupport::TestCase
       assert issue.watched_by?(@author)
       assert issue.watched_by?(@changing_user)
     end
+  end
 end