prepare tests for rails 5

2018-05-03 20:18:55 +02:00
parent ff3b432a1d
commit 174edfb81a
7 changed files with 125 additions and 61 deletions
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@ -41,12 +41,13 @@ class AccountControllerTest < Redmine::ControllerTest
  def test_post_register_with_registration_on
    with_settings self_registration: '3' do
      assert_difference 'User.count' do
-        post :register, user: { login: 'register',
-                                password: 'secret123',
-                                password_confirmation: 'secret123',
-                                firstname: 'John',
-                                lastname: 'Doe',
-                                mail: 'register@example.com' }
+        post :register,
+             params: { user: { login: 'register',
+                               password: 'secret123',
+                               password_confirmation: 'secret123',
+                               firstname: 'John',
+                               lastname: 'Doe',
+                               mail: 'register@example.com' } }
        assert_redirected_to '/my/account'
      end
      user = User.order(id: :desc).first
--- a/test/functional/additionals_assign_to_me_controller_test.rb
+++ b/test/functional/additionals_assign_to_me_controller_test.rb
@ -29,14 +29,16 @@ class AdditionalsAssignToMeControllerTest < Redmine::ControllerTest
  test 'assign issue to user' do
    session[:user_id] = 2
    assert_difference('Journal.count') do
-      put :update, issue_id: 1
+      put :update,
+          params: { issue_id: 1 }
    end
  end

  test 'no update for issue, which already same user is assigned' do
    session[:user_id] = 3
    assert_no_difference('Journal.count') do
-      put :update, issue_id: 2
+      put :update,
+          params: { issue_id: 2 }
    end
  end
 end
--- a/test/functional/additionals_change_status_controller_test.rb
+++ b/test/functional/additionals_change_status_controller_test.rb
@ -29,14 +29,16 @@ class AdditionalsChangeStatusControllerTest < Redmine::ControllerTest
  test 'assign new status to issue' do
    session[:user_id] = 2
    assert_difference('Journal.count') do
-      put :update, issue_id: 4, new_status_id: 3
+      put :update,
+          params: { issue_id: 4, new_status_id: 3 }
    end
  end

  test 'no update for issue, which already has same status' do
    session[:user_id] = 2
    assert_no_difference('Journal.count') do
-      put :update, issue_id: 2, new_status_id: 2
+      put :update,
+          params: { issue_id: 2, new_status_id: 2 }
    end
  end
 end
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@ -35,7 +35,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    manager_role = Role.find(1)
    manager_role.add_permission!(:change_new_issue_author)
    session[:user_id] = 2
-    get :new, project_id: 1
+    get :new,
+        params: { project_id: 1 }

    assert_select '#issue_tracker_id', true
    assert_select '#issue_author_id', true
@ -43,7 +44,8 @@ class IssuesControllerTest < Redmine::ControllerTest

  test 'author field as authorized user in new without change' do
    session[:user_id] = 2
-    get :new, project_id: 1
+    get :new,
+        params: { project_id: 1 }

    assert_select '#issue_tracker_id', true
    assert_select '#issue_author_id', false
@ -51,14 +53,16 @@ class IssuesControllerTest < Redmine::ControllerTest

  test 'author field as authorized user in edit' do
    session[:user_id] = 2
-    get :edit, id: 1
+    get :edit,
+        params: { id: 1 }

    assert_select '#issue_author_id'
  end

  test 'author field as unauthorized user in edit' do
    session[:user_id] = 3
-    get :edit, id: 1
+    get :edit,
+        params: { id: 1 }

    assert_select '#issue_author_id', false
  end
@ -67,7 +71,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    session[:user_id] = 2

    assert_difference('Journal.count') do
-      put :update, id: 1, issue: { author_id: 1 }
+      put :update,
+          params: { id: 1, issue: { author_id: 1 } }
    end
  end

@ -75,7 +80,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    session[:user_id] = 3

    assert_no_difference('Journal.count') do
-      put :update, id: 1, issue: { author_id: 3 }
+      put :update,
+          params: { id: 1, issue: { author_id: 3 } }
    end
  end

@ -85,7 +91,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'a.assign-to-me'
  end

@ -95,7 +102,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'a.assign-to-me', count: 0
  end

@ -105,7 +113,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 4
+    get :show,
+        params: { id: 4 }
    assert_select 'a.assign-to-me', count: 0
  end

@ -115,7 +124,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'ul.issue-status-change-sidebar'
  end

@ -125,7 +135,8 @@ class IssuesControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'ul.issue-status-change-sidebar', count: 0
  end
 end
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@ -26,7 +26,8 @@ class ProjectsControllerTest < Redmine::ControllerTest
      project_overview_content: 'Lore impsuum'
    )
    @request.session[:user_id] = 4
-    get :show, id: 1
+    get :show,
+        params: { id: 1 }

    assert_response :success
    assert_template 'show'
@ -38,7 +39,8 @@ class ProjectsControllerTest < Redmine::ControllerTest
      project_overview_content: ''
    )
    @request.session[:user_id] = 4
-    get :show, id: 1
+    get :show,
+        params: { id: 1 }

    assert_response :success
    assert_template 'show'
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@ -3,7 +3,16 @@ require File.expand_path('../test_helper', __dir__)
 class UsersControllerTest < Redmine::ControllerTest
  fixtures :projects,
           :users,
-           :email_addresses
+           :roles,
+           :members,
+           :member_roles,
+           :issues,
+           :issue_statuses,
+           :versions,
+           :trackers,
+           :projects_trackers,
+           :issue_categories,
+           :enabled_modules

  include Redmine::I18n

@ -19,7 +28,8 @@ class UsersControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'a.user-new-issue'
  end

@ -29,7 +39,8 @@ class UsersControllerTest < Redmine::ControllerTest
    )

    @request.session[:user_id] = 2
-    get :show, id: 2
+    get :show,
+        params: { id: 2 }
    assert_select 'a.user-new-issue', count: 0
  end
 end
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@ -38,7 +38,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{youtube(KMU0tzLwhbE)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'iframe[src=?]', '//www.youtube-nocookie.com/embed/KMU0tzLwhbE'
@ -48,7 +49,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{meteoblue(münchen_deutschland_2867714)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'iframe', src: %r{^https\://www\.meteoblue\.com/en/weather/widget/daily/(.*)}
@ -58,7 +60,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{vimeo(142849533)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'iframe[src=?]', '//player.vimeo.com/video/142849533'
@ -68,7 +71,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{slideshare(57941706)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'iframe[src=?]', '//www.slideshare.net/slideshow/embed_code/57941706'
@ -78,7 +82,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{iframe(https://www.redmine.org/)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'iframe[src=?]', 'https://www.redmine.org/'
@ -88,7 +93,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{twitter(alphanodes)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a.twitter'
@ -97,14 +103,16 @@ class WikiControllerTest < Redmine::ControllerTest

    @page.content.text = '{{twitter(@alphanodes)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_select 'a.twitter'
    assert_select 'a[href=?]', 'https://twitter.com/alphanodes',
                  text: '@alphanodes'

    @page.content.text = '{{twitter(#alphanodes)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_select 'a.twitter'
    assert_select 'a[href=?]', 'https://twitter.com/hashtag/alphanodes',
                  text: '#alphanodes'
@ -114,7 +122,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{reddit(redmine)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a.reddit'
@ -123,14 +132,16 @@ class WikiControllerTest < Redmine::ControllerTest

    @page.content.text = '{{reddit(u/redmine)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_select 'a.reddit'
    assert_select 'a[href=?]', 'https://www.reddit.com/username/redmine',
                  text: 'u/redmine'

    @page.content.text = '{{reddit(r/redmine)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_select 'a.reddit'
    assert_select 'a[href=?]', 'https://www.reddit.com/r/redmine',
                  text: 'r/redmine'
@ -140,7 +151,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{last_updated_by}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'span.last-updated-by'
@ -152,7 +164,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{last_updated_at}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'span.last-updated-at'
@ -163,7 +176,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{recently_updated}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.recently-updated'
@ -173,7 +187,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{calendar(year=1970, month=7)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.month-calendar'
@ -183,7 +198,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{members}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.wiki div.user'
@ -193,7 +209,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{group_users(A Team)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.wiki div.user'
@ -203,7 +220,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{projects}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.wiki div.projects li.project'
@ -213,7 +231,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{gist(plentz/6737338)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'script[src=?]', 'https://gist.github.com/plentz/6737338.js'
@ -223,7 +242,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{tradingview(symbol=NASDAQ:AMZN, locale=en)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'script[src=?]', 'https://s3.tradingview.com/tv.js'
@ -233,7 +253,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{cryptocompare(fsyms=BTC;ETH, type=header_v3)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.wiki div.cryptocompare',
@ -244,7 +265,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{current_weeknumber}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'div.wiki span.current-date', User.current.today.cweek.to_s
@ -254,7 +276,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{issue(2, format=short)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/issues/2',
@ -265,7 +288,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{issue(2, format=link)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/issues/2',
@ -276,7 +300,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{issue(http://test.host/issues/2)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/issues/2',
@ -288,7 +313,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{issue(http://test.host/issues/2#note-1)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/issues/2',
@ -300,7 +326,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{issue(2)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/issues/2',
@ -311,7 +338,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{user(1)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/users/1',
@ -322,7 +350,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{user(1, format=firstname_lastname)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a.user', text: 'Redmine Admin'
@ -334,7 +363,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{user(jsmith)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a[href=?]', '/users/2',
@ -345,7 +375,8 @@ class WikiControllerTest < Redmine::ControllerTest
    @request.session[:user_id] = WIKI_MACRO_USER_ID
    @page.content.text = '{{user(jsmith, format=firstname_lastname, avatar=true)}}'
    @page.content.save!
-    get :show, project_id: 1, id: @page_name
+    get :show,
+        params: { project_id: 1, id: @page_name }
    assert_response :success
    assert_template 'show'
    assert_select 'a.user', text: 'John Smith'
@ -357,7 +388,8 @@ class WikiControllerTest < Redmine::ControllerTest
    Setting.plugin_additionals = ActionController::Parameters.new(
      global_wiki_header: 'Lore impsuum'
    )
-    get :show, project_id: 1, id: 'Another_page'
+    get :show,
+        params: { project_id: 1, id: 'Another_page' }

    assert_response :success
    assert_template 'show'
@ -368,7 +400,8 @@ class WikiControllerTest < Redmine::ControllerTest
    Setting.plugin_additionals = ActionController::Parameters.new(
      global_wiki_header: ''
    )
-    get :show, project_id: 1, id: 'Another_page'
+    get :show,
+        params: { project_id: 1, id: 'Another_page' }

    assert_response :success
    assert_template 'show'
@ -379,7 +412,8 @@ class WikiControllerTest < Redmine::ControllerTest
    Setting.plugin_additionals = ActionController::Parameters.new(
      global_wiki_footer: 'Lore impsuum'
    )
-    get :show, project_id: 1, id: 'Another_page'
+    get :show,
+        params: { project_id: 1, id: 'Another_page' }

    assert_response :success
    assert_template 'show'
@ -390,7 +424,8 @@ class WikiControllerTest < Redmine::ControllerTest
    Setting.plugin_additionals = ActionController::Parameters.new(
      global_wiki_footer: ''
    )
-    get :show, project_id: 1, id: 'Another_page'
+    get :show,
+        params: { project_id: 1, id: 'Another_page' }

    assert_response :success
    assert_template 'show'