diff options
Diffstat (limited to 'spec/features')
3 files changed, 5 insertions, 31 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 332426de07e..99f1b1ab1ad 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -449,8 +449,11 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do page.within '.diff-content' do find('button[data-testid="resolve-discussion-button"]').click + wait_for_requests + find_field('Reply…').click + find('.js-unresolve-checkbox') find('.js-note-text').set 'testing' click_button 'Add comment now' diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb index 56a70f37779..1d99f7a8511 100644 --- a/spec/features/profiles/user_edit_profile_spec.rb +++ b/spec/features/profiles/user_edit_profile_spec.rb @@ -301,6 +301,8 @@ RSpec.describe 'User edit profile' do find('.header-user-dropdown-toggle').click page.within ".header-user" do + find('.js-set-status-modal-trigger.ready') + click_button button_text end end diff --git a/spec/features/user_sees_marketing_header_spec.rb b/spec/features/user_sees_marketing_header_spec.rb deleted file mode 100644 index eae964cec02..00000000000 --- a/spec/features/user_sees_marketing_header_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -RSpec.describe 'User sees experimental lmarketing header' do - let_it_be(:project) { create(:project, :public) } - - context 'when not logged in' do - it 'shows marketing header links', :aggregate_failures do - visit project_path(project) - - expect(page).to have_text "About GitLab" - expect(page).to have_text "Pricing" - expect(page).to have_text "Talk to an expert" - expect(page).to have_text "Sign up now" - expect(page).to have_text "Login" - end - end - - context 'when logged in' do - it 'does not show marketing header links', :aggregate_failures do - sign_in(create(:user)) - - visit project_path(project) - - expect(page).not_to have_text "About GitLab" - expect(page).not_to have_text "Pricing" - expect(page).not_to have_text "Talk to an expert" - end - end -end |