From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/features/projects/settings/pipelines_settings_spec.rb | 2 +- .../features/projects/settings/user_manages_project_members_spec.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'spec/features/projects/settings') diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb index ffc0ecc4966..c087237fd7c 100644 --- a/spec/features/projects/settings/pipelines_settings_spec.rb +++ b/spec/features/projects/settings/pipelines_settings_spec.rb @@ -183,7 +183,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do let(:page_token) { find('#registration_token').text } before do - click_button 'Reset runners registration token' + click_button 'Reset registration token' end it 'changes registration token' do diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb index 3836b95a28a..726b8fb6840 100644 --- a/spec/features/projects/settings/user_manages_project_members_spec.rb +++ b/spec/features/projects/settings/user_manages_project_members_spec.rb @@ -57,7 +57,7 @@ RSpec.describe 'Projects > Settings > User manages project members' do end end - it 'shows all members of project shared group' do + it 'shows all members of project shared group', :js do group.add_owner(user) group.add_developer(user_dmitriy) @@ -67,7 +67,9 @@ RSpec.describe 'Projects > Settings > User manages project members' do visit(project_project_members_path(project)) - page.within('.project-members-groups') do + click_link 'Groups' + + page.within('[data-testid="project-member-groups"]') do expect(page).to have_content('OpenSource') expect(first('.group_member')).to have_content('Maintainer') end -- cgit v1.2.3