From 8b9ad9bf4b46dcf92ba788467207de04c467491d Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 9 Mar 2017 16:59:44 +0000 Subject: [PATCH 1/1] Use user factory for user_roles_helper test --- .rubocop_todo.yml | 2 +- test/helpers/user_roles_helper_test.rb | 47 ++++++++++++++------------ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 4232b0574..68a7566d9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -74,7 +74,7 @@ Metrics/CyclomaticComplexity: # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives. # URISchemes: http, https Metrics/LineLength: - Max: 962 + Max: 1072 # Offense count: 612 # Configuration parameters: CountComments. diff --git a/test/helpers/user_roles_helper_test.rb b/test/helpers/user_roles_helper_test.rb index 53169b75a..880c16e59 100644 --- a/test/helpers/user_roles_helper_test.rb +++ b/test/helpers/user_roles_helper_test.rb @@ -1,51 +1,56 @@ require "test_helper" class UserRolesHelperTest < ActionView::TestCase - fixtures :users, :user_roles - def test_role_icon_normal - @user = users(:normal_user) + user = create(:user) + @user = user - icon = role_icon(users(:normal_user), "moderator") + icon = role_icon(user, "moderator") assert_dom_equal "", icon - icon = role_icon(users(:moderator_user), "moderator") + icon = role_icon(create(:moderator_user), "moderator") assert_dom_equal 'This user is a moderator', icon end def test_role_icon_administrator - @user = users(:administrator_user) + @user = create(:administrator_user) - icon = role_icon(users(:normal_user), "moderator") - assert_dom_equal 'Grant moderator access', icon + user = create(:user) + icon = role_icon(user, "moderator") + assert_dom_equal %(Grant moderator access), icon - icon = role_icon(users(:moderator_user), "moderator") - assert_dom_equal 'Revoke moderator access', icon + moderator_user = create(:moderator_user) + icon = role_icon(moderator_user, "moderator") + assert_dom_equal %(Revoke moderator access), icon end def test_role_icons_normal - @user = users(:normal_user) + user = create(:user) + @user = user - icons = role_icons(users(:normal_user)) + icons = role_icons(user) assert_dom_equal " ", icons - icons = role_icons(users(:moderator_user)) + icons = role_icons(create(:moderator_user)) assert_dom_equal ' This user is a moderator', icons - icons = role_icons(users(:super_user)) + icons = role_icons(create(:super_user)) assert_dom_equal ' This user is an administrator This user is a moderator', icons end def test_role_icons_administrator - @user = users(:administrator_user) + @user = create(:administrator_user) - icons = role_icons(users(:normal_user)) - assert_dom_equal ' Grant administrator access Grant moderator access', icons + user = create(:user) + icons = role_icons(user) + assert_dom_equal %( Grant administrator access Grant moderator access), icons - icons = role_icons(users(:moderator_user)) - assert_dom_equal ' Grant administrator access Revoke moderator access', icons + moderator_user = create(:moderator_user) + icons = role_icons(moderator_user) + assert_dom_equal %( Grant administrator access Revoke moderator access), icons - icons = role_icons(users(:super_user)) - assert_dom_equal ' Revoke administrator access Revoke moderator access', icons + super_user = create(:super_user) + icons = role_icons(super_user) + assert_dom_equal %( Revoke administrator access Revoke moderator access), icons end end -- 2.39.5