From f372510130b9dcc2cf426cd48aa9bc5c8e20a4f1 Mon Sep 17 00:00:00 2001 From: Bernhard Rohloff Date: Fri, 3 Dec 2021 10:34:36 +0100 Subject: [PATCH 2/3] changed and added tests --- test/integration/layout_test.rb | 14 ++++++++++++-- test/unit/lib/redmine_test.rb | 15 ++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index e9922a053..fdffdc6fa 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -45,10 +45,20 @@ class LayoutTest < Redmine::IntegrationTest assert_select "#admin-menu", :count => 0 end + def test_user_menu_not_visible_when_not_logged_in + with_settings :login_required => '1' do + get '/' + assert_select "#user-menu", 0 + log_user('jsmith','jsmith') + get '/' + assert_select "#user-menu" + end + end + def test_top_menu_and_search_not_visible_when_login_required with_settings :login_required => '1' do get '/' - assert_select "#top-menu > ul", 0 + assert_select "#global-nav > ul", 0 assert_select "#quick-search", 0 end end @@ -56,7 +66,7 @@ class LayoutTest < Redmine::IntegrationTest def test_top_menu_and_search_visible_when_login_not_required with_settings :login_required => '0' do get '/' - assert_select "#top-menu > ul" + assert_select "#global-nav > ul" assert_select "#quick-search" end end diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb index 7bad7b168..b9d41bcf8 100644 --- a/test/unit/lib/redmine_test.rb +++ b/test/unit/lib/redmine_test.rb @@ -39,22 +39,27 @@ class RedmineTest < ActiveSupport::TestCase include RedmineMenuTestHelper def test_top_menu - assert_number_of_items_in_menu :top_menu, 5 + assert_number_of_items_in_menu :top_menu, 4 assert_menu_contains_item_named :top_menu, :home - assert_menu_contains_item_named :top_menu, :my_page assert_menu_contains_item_named :top_menu, :projects assert_menu_contains_item_named :top_menu, :administration assert_menu_contains_item_named :top_menu, :help end def test_account_menu - assert_number_of_items_in_menu :account_menu, 4 + assert_number_of_items_in_menu :account_menu, 2 assert_menu_contains_item_named :account_menu, :login assert_menu_contains_item_named :account_menu, :register - assert_menu_contains_item_named :account_menu, :my_account - assert_menu_contains_item_named :account_menu, :logout end +# def test_user_menu +# assert_number_of_items_in_menu :user_menu, 4 +# assert_menu_contains_item_named :user_menu, :login +# assert_menu_contains_item_named :user_menu, :register +# assert_menu_contains_item_named :user_menu, :my_account +# assert_menu_contains_item_named :user_menu, :logout +# end + def test_application_menu assert_number_of_items_in_menu :application_menu, 0 end -- 2.25.1