diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb')
-rw-r--r-- | spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb index 0620f819332..3dd993b4bb5 100644 --- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb +++ b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'The group dashboard' do include ExternalAuthorizationServiceHelpers + include Spec::Support::Helpers::Features::TopNavSpecHelpers let(:user) { create(:user) } @@ -14,11 +15,11 @@ RSpec.describe 'The group dashboard' do describe 'The top navigation' do it 'has all the expected links' do - pending_on_combined_menu_flag - visit dashboard_groups_path - within('.navbar') do + open_top_nav + + within_top_nav do expect(page).to have_button('Projects') expect(page).to have_button('Groups') expect(page).to have_link('Activity') @@ -28,12 +29,12 @@ RSpec.describe 'The group dashboard' do end it 'hides some links when an external authorization service is enabled' do - pending_on_combined_menu_flag - enable_external_authorization_service_check visit dashboard_groups_path - within('.navbar') do + open_top_nav + + within_top_nav do expect(page).to have_button('Projects') expect(page).to have_button('Groups') expect(page).not_to have_link('Activity') @@ -44,7 +45,7 @@ RSpec.describe 'The group dashboard' do end end - context 'with combined_menu: feature flag on' do + context 'with combined_menu feature flag on', :js do let(:needs_rewrite_for_combined_menu_flag_on) { true } before do @@ -63,8 +64,4 @@ RSpec.describe 'The group dashboard' do it_behaves_like 'combined_menu: feature flag examples' end - - def pending_on_combined_menu_flag - pending 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56587' if needs_rewrite_for_combined_menu_flag_on - end end |