diff options
Diffstat (limited to 'spec/features/issues')
| -rw-r--r-- | spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/issues/csv_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/issues/gfm_autocomplete_spec.rb | 682 | ||||
| -rw-r--r-- | spec/features/issues/issue_state_spec.rb | 26 | ||||
| -rw-r--r-- | spec/features/issues/user_interacts_with_awards_spec.rb | 8 |
5 files changed, 263 insertions, 459 deletions
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb index d773126e00c..a4e9df604a9 100644 --- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb @@ -89,6 +89,8 @@ RSpec.describe 'Resolving all open threads in a merge request from an issue', :j before do page.within '.mr-widget-body' do page.click_link 'Resolve all threads in new issue', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid) + + wait_for_all_requests end end diff --git a/spec/features/issues/csv_spec.rb b/spec/features/issues/csv_spec.rb index c93693ec40a..d41a41c4383 100644 --- a/spec/features/issues/csv_spec.rb +++ b/spec/features/issues/csv_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Issues csv' do +RSpec.describe 'Issues csv', :js do let(:user) { create(:user) } let(:project) { create(:project, :public) } let(:milestone) { create(:milestone, title: 'v1.0', project: project) } @@ -17,7 +17,7 @@ RSpec.describe 'Issues csv' do def request_csv(params = {}) visit project_issues_path(project, params) page.within('.nav-controls') do - click_on 'Export as CSV' + find('[data-testid="export-csv-button"]').click end click_on 'Export issues' end diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb index e2087868035..e6ebc37ba59 100644 --- a/spec/features/issues/gfm_autocomplete_spec.rb +++ b/spec/features/issues/gfm_autocomplete_spec.rb @@ -6,6 +6,7 @@ RSpec.describe 'GFM autocomplete', :js do let_it_be(:user_xss_title) { 'eve <img src=x onerror=alert(2)<img src=x onerror=alert(1)>' } let_it_be(:user_xss) { create(:user, name: user_xss_title, username: 'xss.user') } let_it_be(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') } + let_it_be(:user2) { create(:user, name: 'Marge Simpson', username: 'msimpson') } let_it_be(:group) { create(:group, name: 'Ancestor') } let_it_be(:child_group) { create(:group, parent: group, name: 'My group') } let_it_be(:project) { create(:project, group: child_group) } @@ -16,6 +17,7 @@ RSpec.describe 'GFM autocomplete', :js do before_all do project.add_maintainer(user) project.add_maintainer(user_xss) + project.add_maintainer(user2) end describe 'when tribute_autocomplete feature flag is off' do @@ -29,289 +31,218 @@ RSpec.describe 'GFM autocomplete', :js do end it 'updates issue description with GFM reference' do - find('.js-issuable-edit').click + click_button 'Edit title and description' wait_for_requests - simulate_input('#issue-description', "@#{user.name[0...3]}") + fill_in 'Description', with: "@#{user.name[0...3]}" wait_for_requests - find('.atwho-view .cur').click + find_highlighted_autocomplete_item.click click_button 'Save changes' wait_for_requests - expect(find('.description')).to have_content(user.to_reference) + expect(find('.description')).to have_text(user.to_reference) end it 'opens quick action autocomplete when updating description' do - find('.js-issuable-edit').click + click_button 'Edit title and description' - find('#issue-description').native.send_keys('/') + fill_in 'Description', with: '/' - expect(page).to have_selector('.atwho-container') + expect(find_autocomplete_menu).to be_visible end it 'opens autocomplete menu when field starts with text' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@') - end + fill_in 'Comment', with: '@' - expect(page).to have_selector('.atwho-container') + expect(find_autocomplete_menu).to be_visible end it 'opens autocomplete menu for Issues when field starts with text with item escaping HTML characters' do issue_xss_title = 'This will execute alert<img src=x onerror=alert(2)<img src=x onerror=alert(1)>' create(:issue, project: project, title: issue_xss_title) - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('#') - end + fill_in 'Comment', with: '#' wait_for_requests - expect(page).to have_selector('.atwho-container') - - page.within '.atwho-container #at-view-issues' do - expect(page.all('li').first.text).to include(issue_xss_title) - end + expect(find_autocomplete_menu).to have_text(issue_xss_title) end it 'opens autocomplete menu for Username when field starts with text with item escaping HTML characters' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@ev') - end + fill_in 'Comment', with: '@ev' wait_for_requests - expect(page).to have_selector('.atwho-container') - - page.within '.atwho-container #at-view-users' do - expect(find('li').text).to have_content(user_xss.username) - end + expect(find_highlighted_autocomplete_item).to have_text(user_xss.username) end it 'opens autocomplete menu for Milestone when field starts with text with item escaping HTML characters' do milestone_xss_title = 'alert milestone <img src=x onerror="alert(\'Hello xss\');" a' create(:milestone, project: project, title: milestone_xss_title) - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('%') - end + fill_in 'Comment', with: '%' wait_for_requests - expect(page).to have_selector('.atwho-container') - - page.within '.atwho-container #at-view-milestones' do - expect(find('li').text).to have_content('alert milestone') - end + expect(find_autocomplete_menu).to have_text('alert milestone') end it 'doesnt open autocomplete menu character is prefixed with text' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('testing') - find('#note-body').native.send_keys('@') - end + fill_in 'Comment', with: 'testing@' - expect(page).not_to have_selector('.atwho-view') + expect(page).not_to have_css('.atwho-view') end it 'doesnt select the first item for non-assignee dropdowns' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys(':') - end - - expect(page).to have_selector('.atwho-container') + fill_in 'Comment', with: ':' wait_for_requests - expect(find('#at-view-58')).not_to have_selector('.cur:first-of-type') + expect(find_autocomplete_menu).not_to have_css('.cur') end it 'does not open autocomplete menu when ":" is prefixed by a number and letters' do - note = find('#note-body') - # Number. - page.within '.timeline-content-form' do - note.native.send_keys('7:') - end - - expect(page).not_to have_selector('.atwho-view') + fill_in 'Comment', with: '7:' + expect(page).not_to have_css('.atwho-view') # ASCII letter. - page.within '.timeline-content-form' do - note.set('') - note.native.send_keys('w:') - end - - expect(page).not_to have_selector('.atwho-view') + fill_in 'Comment', with: 'w:' + expect(page).not_to have_css('.atwho-view') # Non-ASCII letter. - page.within '.timeline-content-form' do - note.set('') - note.native.send_keys('Ё:') - end - - expect(page).not_to have_selector('.atwho-view') + fill_in 'Comment', with: 'Ё:' + expect(page).not_to have_css('.atwho-view') end it 'selects the first item for assignee dropdowns' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@') - end - - expect(page).to have_selector('.atwho-container') + fill_in 'Comment', with: '@' wait_for_requests - expect(find('#at-view-users')).to have_selector('.cur:first-of-type') + expect(find_autocomplete_menu).to have_css('.cur:first-of-type') end it 'includes items for assignee dropdowns with non-ASCII characters in name' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('') - simulate_input('#note-body', "@#{user.name[0...8]}") - end - - expect(page).to have_selector('.atwho-container') + fill_in 'Comment', with: "@#{user.name[0...8]}" wait_for_requests - expect(find('#at-view-users')).to have_content(user.name) + expect(find_autocomplete_menu).to have_text(user.name) end it 'searches across full name for assignees' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@speciąlsome') - end + fill_in 'Comment', with: '@speciąlsome' wait_for_requests - expect(find('.atwho-view li', visible: true)).to have_content(user.name) + expect(find_highlighted_autocomplete_item).to have_text(user.name) end - it 'selects the first item for non-assignee dropdowns if a query is entered' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys(':1') - end + it 'shows names that start with the query as the top result' do + fill_in 'Comment', with: '@mar' + + wait_for_requests + + expect(find_highlighted_autocomplete_item).to have_text(user2.name) + end + + it 'shows usernames that start with the query as the top result' do + fill_in 'Comment', with: '@msi' + + wait_for_requests + + expect(find_highlighted_autocomplete_item).to have_text(user2.name) + end + + # Regression test for https://gitlab.com/gitlab-org/gitlab/-/issues/321925 + it 'shows username when pasting then pressing Enter' do + fill_in 'Comment', with: "@#{user.username}\n" + + expect(find_field('Comment').value).to have_text "@#{user.username}" + end - expect(page).to have_selector('.atwho-container') + it 'does not show `@undefined` when pressing `@` then Enter' do + fill_in 'Comment', with: "@\n" + + expect(find_field('Comment').value).to have_text '@' + expect(find_field('Comment').value).not_to have_text '@undefined' + end + + it 'selects the first item for non-assignee dropdowns if a query is entered' do + fill_in 'Comment', with: ':1' wait_for_requests - expect(find('#at-view-58')).to have_selector('.cur:first-of-type') + expect(find_autocomplete_menu).to have_css('.cur:first-of-type') end context 'if a selected value has special characters' do it 'wraps the result in double quotes' do - note = find('#note-body') - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('') - simulate_input('#note-body', "~#{label.title[0]}") - end + fill_in 'Comment', with: "~#{label.title[0]}" - label_item = find('.atwho-view li', text: label.title) + find_highlighted_autocomplete_item.click - expect_to_wrap(true, label_item, note, label.title) + expect(find_field('Comment').value).to have_text("~\"#{label.title}\"") end it "shows dropdown after a new line" do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('test') - note.native.send_keys(:enter) - note.native.send_keys(:enter) - note.native.send_keys('@') - end + fill_in 'Comment', with: "test\n\n@" - expect(page).to have_selector('.atwho-container') + expect(find_autocomplete_menu).to be_visible end it "does not show dropdown when preceded with a special character" do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys("@") - end - - expect(page).to have_selector('.atwho-container') - - page.within '.timeline-content-form' do - note.native.send_keys("@") - end + fill_in 'Comment', with: '@@' - expect(page).to have_selector('.atwho-container', visible: false) - end - - it "does not throw an error if no labels exist" do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('~') - end - - expect(page).to have_selector('.atwho-container', visible: false) + expect(page).not_to have_css('.atwho-view') end it 'doesn\'t wrap for assignee values' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys("@#{user.username[0]}") - end + fill_in 'Comment', with: "@#{user.username[0]}" - user_item = find('.atwho-view li', text: user.username) + find_highlighted_autocomplete_item.click - expect_to_wrap(false, user_item, note, user.username) + expect(find_field('Comment').value).to have_text("@#{user.username}") end it 'doesn\'t wrap for emoji values' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys(":cartwheel_") - end + fill_in 'Comment', with: ':cartwheel_' - emoji_item = find('.atwho-view li', text: 'cartwheel_tone1') + find_highlighted_autocomplete_item.click - expect_to_wrap(false, emoji_item, note, 'cartwheel_tone1') + expect(find_field('Comment').value).to have_text('cartwheel_tone1') end it 'doesn\'t open autocomplete after non-word character' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys("@#{user.username[0..2]}!") - end + fill_in 'Comment', with: "@#{user.username[0..2]}!" - expect(page).not_to have_selector('.atwho-view') + expect(page).not_to have_css('.atwho-view') end it 'doesn\'t open autocomplete if there is no space before' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys("hello:#{user.username[0..2]}") - end + fill_in 'Comment', with: "hello:#{user.username[0..2]}" - expect(page).not_to have_selector('.atwho-view') + expect(page).not_to have_css('.atwho-view') end it 'triggers autocomplete after selecting a quick action' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/as') - end + fill_in 'Comment', with: '/as' - find('.atwho-view li', text: '/assign') - note.native.send_keys(:tab) + find_highlighted_autocomplete_item.click - user_item = find('.atwho-view li', text: user.username) - expect(user_item).to have_content(user.username) + expect(find_autocomplete_menu).to have_text(user.username) end it 'does not limit quick actions autocomplete list to 5' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/') - end + fill_in 'Comment', with: '/' - expect(page).to have_selector('.atwho-view li', minimum: 6, visible: true) + expect(find_autocomplete_menu).to have_css('li', minimum: 6) end end @@ -328,30 +259,23 @@ RSpec.describe 'GFM autocomplete', :js do it 'lists users who are currently not assigned to the issue when using /assign' do visit project_issue_path(project, issue_assignee) - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/as') - end - - find('.atwho-view li', text: '/assign') - note.native.send_keys(:tab) + fill_in 'Comment', with: '/as' - wait_for_requests + find_highlighted_autocomplete_item.click - expect(find('#at-view-users .atwho-view-ul')).not_to have_content(user.username) - expect(find('#at-view-users .atwho-view-ul')).to have_content(unassigned_user.username) + expect(find_autocomplete_menu).not_to have_text(user.username) + expect(find_autocomplete_menu).to have_text(unassigned_user.username) end it 'shows dropdown on new issue form' do visit new_project_issue_path(project) - textarea = find('#issue_description') - textarea.native.send_keys('/ass') - find('.atwho-view li', text: '/assign') - textarea.native.send_keys(:tab) + fill_in 'Description', with: '/ass' - expect(find('#at-view-users .atwho-view-ul')).to have_content(unassigned_user.username) - expect(find('#at-view-users .atwho-view-ul')).to have_content(user.username) + find_highlighted_autocomplete_item.click + + expect(find_autocomplete_menu).to have_text(unassigned_user.username) + expect(find_autocomplete_menu).to have_text(user.username) end end @@ -360,80 +284,62 @@ RSpec.describe 'GFM autocomplete', :js do label_xss_title = 'alert label <img src=x onerror="alert(\'Hello xss\');" a' create(:label, project: project, title: label_xss_title) - note = find('#note-body') - - # It should show all the labels on "~". - type(note, '~') + fill_in 'Comment', with: '~' wait_for_requests - page.within '.atwho-container #at-view-labels' do - expect(find('.atwho-view-ul').text).to have_content('alert label') - end + expect(find_autocomplete_menu).to have_text('alert label') end it 'allows colons when autocompleting scoped labels' do create(:label, project: project, title: 'scoped:label') - note = find('#note-body') - type(note, '~scoped:') + fill_in 'Comment', with: '~scoped:' wait_for_requests - page.within '.atwho-container #at-view-labels' do - expect(find('.atwho-view-ul').text).to have_content('scoped:label') - end + expect(find_autocomplete_menu).to have_text('scoped:label') end it 'allows colons when autocompleting scoped labels with double colons' do create(:label, project: project, title: 'scoped::label') - note = find('#note-body') - type(note, '~scoped::') + fill_in 'Comment', with: '~scoped::' wait_for_requests - page.within '.atwho-container #at-view-labels' do - expect(find('.atwho-view-ul').text).to have_content('scoped::label') - end + expect(find_autocomplete_menu).to have_text('scoped::label') end it 'allows spaces when autocompleting multi-word labels' do create(:label, project: project, title: 'Accepting merge requests') - note = find('#note-body') - type(note, '~Accepting merge') + fill_in 'Comment', with: '~Accepting merge' wait_for_requests - page.within '.atwho-container #at-view-labels' do - expect(find('.atwho-view-ul').text).to have_content('Accepting merge requests') - end + expect(find_autocomplete_menu).to have_text('Accepting merge requests') end it 'only autocompletes the latest label' do create(:label, project: project, title: 'Accepting merge requests') create(:label, project: project, title: 'Accepting job applicants') - note = find('#note-body') - type(note, '~Accepting merge requests foo bar ~Accepting job') + fill_in 'Comment', with: '~Accepting merge requests foo bar ~Accepting job' wait_for_requests - page.within '.atwho-container #at-view-labels' do - expect(find('.atwho-view-ul').text).to have_content('Accepting job applicants') - end + expect(find_autocomplete_menu).to have_text('Accepting job applicants') end it 'does not autocomplete labels if no tilde is typed' do create(:label, project: project, title: 'Accepting merge requests') - note = find('#note-body') - type(note, 'Accepting merge') + fill_in 'Comment', with: 'Accepting merge' wait_for_requests - expect(page).not_to have_css('.atwho-container #at-view-labels') + expect(page).not_to have_css('.atwho-view') end end @@ -443,7 +349,7 @@ RSpec.describe 'GFM autocomplete', :js do # This is meant to protect against this issue https://gitlab.com/gitlab-org/gitlab/-/issues/228729 it 'keeps autocomplete key listeners' do visit project_issue_path(project, issue) - note = find('#note-body') + note = find_field('Comment') start_comment_with_emoji(note, '.atwho-view li') @@ -459,17 +365,11 @@ RSpec.describe 'GFM autocomplete', :js do shared_examples 'autocomplete suggestions' do it 'suggests objects correctly' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys(object.class.reference_prefix) - end - - page.within '.atwho-container' do - expect(page).to have_content(object.title) + fill_in 'Comment', with: object.class.reference_prefix - find('ul li').click - end + find_autocomplete_menu.find('li').click - expect(find('.new-note #note-body').value).to include(expected_body) + expect(find_field('Comment').value).to have_text(expected_body) end end @@ -502,10 +402,40 @@ RSpec.describe 'GFM autocomplete', :js do end context 'milestone' do - let!(:object) { create(:milestone, project: project) } - let(:expected_body) { object.to_reference } + let_it_be(:milestone_expired) { create(:milestone, project: project, due_date: 5.days.ago) } + let_it_be(:milestone_no_duedate) { create(:milestone, project: project, title: 'Foo - No due date') } + let_it_be(:milestone1) { create(:milestone, project: project, title: 'Milestone-1', due_date: 20.days.from_now) } + let_it_be(:milestone2) { create(:milestone, project: project, title: 'Milestone-2', due_date: 15.days.from_now) } + let_it_be(:milestone3) { create(:milestone, project: project, title: 'Milestone-3', due_date: 10.days.from_now) } - it_behaves_like 'autocomplete suggestions' + before do + fill_in 'Comment', with: '/milestone %' + + wait_for_requests + end + + it 'shows milestons list in the autocomplete menu' do + page.within(find_autocomplete_menu) do + expect(page).to have_selector('li', count: 5) + end + end + + it 'shows expired milestone at the bottom of the list' do + page.within(find_autocomplete_menu) do + expect(page.find('li:last-child')).to have_content milestone_expired.title + end + end + + it 'shows milestone due earliest at the top of the list' do + page.within(find_autocomplete_menu) do + aggregate_failures do + expect(page.all('li')[0]).to have_content milestone3.title + expect(page.all('li')[1]).to have_content milestone2.title + expect(page.all('li')[2]).to have_content milestone1.title + expect(page.all('li')[3]).to have_content milestone_no_duedate.title + end + end + end end end @@ -520,237 +450,160 @@ RSpec.describe 'GFM autocomplete', :js do end it 'updates issue description with GFM reference' do - find('.js-issuable-edit').click + click_button 'Edit title and description' wait_for_requests - simulate_input('#issue-description', "@#{user.name[0...3]}") + fill_in 'Description', with: "@#{user.name[0...3]}" wait_for_requests - find('.tribute-container .highlight', visible: true).click + find_highlighted_tribute_autocomplete_menu.click click_button 'Save changes' wait_for_requests - expect(find('.description')).to have_content(user.to_reference) + expect(find('.description')).to have_text(user.to_reference) end it 'opens autocomplete menu when field starts with text' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@') - end + fill_in 'Comment', with: '@' - expect(page).to have_selector('.tribute-container', visible: true) + expect(find_tribute_autocomplete_menu).to be_visible end it 'opens autocomplete menu for Issues when field starts with text with item escaping HTML characters' do issue_xss_title = 'This will execute alert<img src=x onerror=alert(2)<img src=x onerror=alert(1)>' create(:issue, project: project, title: issue_xss_title) - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('#') - end + fill_in 'Comment', with: '#' wait_for_requests - expect(page).to have_selector('.tribute-container', visible: true) - - page.within '.tribute-container ul' do - expect(page.all('li').first.text).to include(issue_xss_title) - end + expect(find_tribute_autocomplete_menu).to have_text(issue_xss_title) end it 'opens autocomplete menu for Username when field starts with text with item escaping HTML characters' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@ev') - end + fill_in 'Comment', with: '@ev' wait_for_requests - expect(page).to have_selector('.tribute-container', visible: true) - - expect(find('.tribute-container ul', visible: true)).to have_text(user_xss.username) + expect(find_tribute_autocomplete_menu).to have_text(user_xss.username) end it 'opens autocomplete menu for Milestone when field starts with text with item escaping HTML characters' do milestone_xss_title = 'alert milestone <img src=x onerror="alert(\'Hello xss\');" a' create(:milestone, project: project, title: milestone_xss_title) - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('%') - end + fill_in 'Comment', with: '%' wait_for_requests - expect(page).to have_selector('.tribute-container', visible: true) - - expect(find('.tribute-container ul', visible: true)).to have_text('alert milestone') + expect(find_tribute_autocomplete_menu).to have_text('alert milestone') end it 'does not open autocomplete menu when trigger character is prefixed with text' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('testing') - find('#note-body').native.send_keys('@') - end + fill_in 'Comment', with: 'testing@' - expect(page).not_to have_selector('.tribute-container', visible: true) + expect(page).not_to have_css('.tribute-container') end it 'does not open autocomplete menu when ":" is prefixed by a number and letters' do - note = find('#note-body') - # Number. - page.within '.timeline-content-form' do - note.native.send_keys('7:') - end - - expect(page).not_to have_selector('.tribute-container', visible: true) + fill_in 'Comment', with: '7:' + expect(page).not_to have_css('.tribute-container') # ASCII letter. - page.within '.timeline-content-form' do - note.set('') - note.native.send_keys('w:') - end - - expect(page).not_to have_selector('.tribute-container', visible: true) + fill_in 'Comment', with: 'w:' + expect(page).not_to have_css('.tribute-container') # Non-ASCII letter. - page.within '.timeline-content-form' do - note.set('') - note.native.send_keys('Ё:') - end - - expect(page).not_to have_selector('.tribute-container', visible: true) + fill_in 'Comment', with: 'Ё:' + expect(page).not_to have_css('.tribute-container') end it 'selects the first item for assignee dropdowns' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@') - end - - expect(page).to have_selector('.tribute-container', visible: true) + fill_in 'Comment', with: '@' wait_for_requests - expect(find('.tribute-container ul', visible: true)).to have_selector('.highlight:first-of-type') + expect(find_tribute_autocomplete_menu).to have_css('.highlight:first-of-type') end it 'includes items for assignee dropdowns with non-ASCII characters in name' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('') - simulate_input('#note-body', "@#{user.name[0...8]}") - end - - expect(page).to have_selector('.tribute-container', visible: true) + fill_in 'Comment', with: "@#{user.name[0...8]}" wait_for_requests - expect(find('.tribute-container ul', visible: true)).to have_content(user.name) + expect(find_tribute_autocomplete_menu).to have_text(user.name) end it 'selects the first item for non-assignee dropdowns if a query is entered' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys(':1') - end + fill_in 'Comment', with: ':1' wait_for_requests - expect(find('.tribute-container ul', visible: true)).to have_selector('.highlight:first-of-type') + expect(find_tribute_autocomplete_menu).to have_css('.highlight:first-of-type') end context 'when autocompleting for groups' do it 'shows the group when searching for the name of the group' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@mygroup') - end + fill_in 'Comment', with: '@mygroup' - expect(find('.tribute-container ul', visible: true)).to have_text('My group') + expect(find_tribute_autocomplete_menu).to have_text('My group') end it 'does not show the group when searching for the name of the parent of the group' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('@ancestor') - end + fill_in 'Comment', with: '@ancestor' - expect(find('.tribute-container ul', visible: true)).not_to have_text('My group') + expect(find_tribute_autocomplete_menu).not_to have_text('My group') end end context 'if a selected value has special characters' do it 'wraps the result in double quotes' do - note = find('#note-body') - page.within '.timeline-content-form' do - find('#note-body').native.send_keys('') - simulate_input('#note-body', "~#{label.title[0]}") - end + fill_in 'Comment', with: "~#{label.title[0]}" - label_item = find('.tribute-container ul', text: label.title, visible: true) + find_highlighted_tribute_autocomplete_menu.click - expect_to_wrap(true, label_item, note, label.title) + expect(find_field('Comment').value).to have_text("~\"#{label.title}\"") end it "shows dropdown after a new line" do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('test') - note.native.send_keys(:enter) - note.native.send_keys(:enter) - note.native.send_keys('@') - end - - expect(page).to have_selector('.tribute-container', visible: true) - end - - it "does not throw an error if no labels exist" do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('~') - end + fill_in 'Comment', with: "test\n\n@" - expect(page).to have_selector('.tribute-container', visible: false) + expect(find_tribute_autocomplete_menu).to be_visible end it 'doesn\'t wrap for assignee values' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys("@#{user.username[0]}") - end + fill_in 'Comment', with: "@#{user.username[0..2]}" - user_item = find('.tribute-container ul', text: user.username, visible: true) + find_highlighted_tribute_autocomplete_menu.click - expect_to_wrap(false, user_item, note, user.username) + expect(find_field('Comment').value).to have_text("@#{user.username}") end it 'does not wrap for emoji values' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys(":cartwheel_") - end + fill_in 'Comment', with: ':cartwheel_' - emoji_item = first('.tribute-container li', text: 'cartwheel_tone1', visible: true) + find_highlighted_tribute_autocomplete_menu.click - expect_to_wrap(false, emoji_item, note, 'cartwheel_tone1') + expect(find_field('Comment').value).to have_text('cartwheel_tone1') end it 'does not open autocomplete if there is no space before' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys("hello:#{user.username[0..2]}") - end + fill_in 'Comment', with: "hello:#{user.username[0..2]}" - expect(page).not_to have_selector('.tribute-container') + expect(page).not_to have_css('.tribute-container') end it 'autocompletes for quick actions' do - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/as') - wait_for_requests - note.native.send_keys(:tab) - end + fill_in 'Comment', with: '/as' + + find_highlighted_tribute_autocomplete_menu.click - expect(note.value).to have_text('/assign') + expect(find_field('Comment').value).to have_text('/assign') end end @@ -767,37 +620,33 @@ RSpec.describe 'GFM autocomplete', :js do it 'lists users who are currently not assigned to the issue when using /assign' do visit project_issue_path(project, issue_assignee) - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/assign ') - # The `/assign` ajax response might replace the one by `@` below causing a failed test - # so we need to wait for the `/assign` ajax request to finish first - wait_for_requests - note.native.send_keys('@') - wait_for_requests - end + note = find_field('Comment') + note.native.send_keys('/assign ') + # The `/assign` ajax response might replace the one by `@` below causing a failed test + # so we need to wait for the `/assign` ajax request to finish first + wait_for_requests + note.native.send_keys('@') + wait_for_requests - expect(find('.tribute-container ul', visible: true)).not_to have_content(user.username) - expect(find('.tribute-container ul', visible: true)).to have_content(unassigned_user.username) + expect(find_tribute_autocomplete_menu).not_to have_text(user.username) + expect(find_tribute_autocomplete_menu).to have_text(unassigned_user.username) end it 'lists users who are currently not assigned to the issue when using /assign on the second line' do visit project_issue_path(project, issue_assignee) - note = find('#note-body') - page.within '.timeline-content-form' do - note.native.send_keys('/assign @user2') - note.native.send_keys(:enter) - note.native.send_keys('/assign ') - # The `/assign` ajax response might replace the one by `@` below causing a failed test - # so we need to wait for the `/assign` ajax request to finish first - wait_for_requests - note.native.send_keys('@') - wait_for_requests - end + note = find_field('Comment') + note.native.send_keys('/assign @user2') + note.native.send_keys(:enter) + note.native.send_keys('/assign ') + # The `/assign` ajax response might replace the one by `@` below causing a failed test + # so we need to wait for the `/assign` ajax request to finish first + wait_for_requests + note.native.send_keys('@') + wait_for_requests - expect(find('.tribute-container ul', visible: true)).not_to have_content(user.username) - expect(find('.tribute-container ul', visible: true)).to have_content(unassigned_user.username) + expect(find_tribute_autocomplete_menu).not_to have_text(user.username) + expect(find_tribute_autocomplete_menu).to have_text(unassigned_user.username) end end @@ -806,72 +655,65 @@ RSpec.describe 'GFM autocomplete', :js do label_xss_title = 'alert label <img src=x onerror="alert(\'Hello xss\');" a' create(:label, project: project, title: label_xss_title) - note = find('#note-body') - - # It should show all the labels on "~". - type(note, '~') + fill_in 'Comment', with: '~' wait_for_requests - expect(find('.tribute-container ul', visible: true).text).to have_content('alert label') + expect(find_tribute_autocomplete_menu).to have_text('alert label') end it 'allows colons when autocompleting scoped labels' do create(:label, project: project, title: 'scoped:label') - note = find('#note-body') - type(note, '~scoped:') + fill_in 'Comment', with: '~scoped:' wait_for_requests - expect(find('.tribute-container ul', visible: true).text).to have_content('scoped:label') + expect(find_tribute_autocomplete_menu).to have_text('scoped:label') end it 'allows colons when autocompleting scoped labels with double colons' do create(:label, project: project, title: 'scoped::label') - note = find('#note-body') - type(note, '~scoped::') + fill_in 'Comment', with: '~scoped::' wait_for_requests - expect(find('.tribute-container ul', visible: true).text).to have_content('scoped::label') + expect(find_tribute_autocomplete_menu).to have_text('scoped::label') end it 'autocompletes multi-word labels' do create(:label, project: project, title: 'Accepting merge requests') - note = find('#note-body') - type(note, '~Acceptingmerge') + fill_in 'Comment', with: '~Acceptingmerge' wait_for_requests - expect(find('.tribute-container ul', visible: true).text).to have_content('Accepting merge requests') + expect(find_tribute_autocomplete_menu).to have_text('Accepting merge requests') end it 'only autocompletes the latest label' do create(:label, project: project, title: 'documentation') create(:label, project: project, title: 'feature') - note = find('#note-body') - type(note, '~documentation foo bar ~feat') - note.native.send_keys(:right) + fill_in 'Comment', with: '~documentation foo bar ~feat' + # Invoke autocompletion + find_field('Comment').native.send_keys(:right) wait_for_requests - expect(find('.tribute-container ul', visible: true).text).to have_content('feature') - expect(find('.tribute-container ul', visible: true).text).not_to have_content('documentation') + expect(find_tribute_autocomplete_menu).to have_text('feature') + expect(find_tribute_autocomplete_menu).not_to have_text('documentation') end it 'does not autocomplete labels if no tilde is typed' do create(:label, project: project, title: 'documentation') - note = find('#note-body') - type(note, 'document') + fill_in 'Comment', with: 'document' wait_for_requests - expect(page).not_to have_selector('.tribute-container') + expect(page).not_to have_css('.tribute-container') end end @@ -881,7 +723,7 @@ RSpec.describe 'GFM autocomplete', :js do # This is meant to protect against this issue https://gitlab.com/gitlab-org/gitlab/-/issues/228729 it 'keeps autocomplete key listeners' do visit project_issue_path(project, issue) - note = find('#note-body') + note = find_field('Comment') start_comment_with_emoji(note, '.tribute-container li') @@ -897,17 +739,11 @@ RSpec.describe 'GFM autocomplete', :js do shared_examples 'autocomplete suggestions' do it 'suggests objects correctly' do - page.within '.timeline-content-form' do - find('#note-body').native.send_keys(object.class.reference_prefix) - end - - page.within '.tribute-container' do - expect(page).to have_content(object.title) + fill_in 'Comment', with: object.class.reference_prefix - find('ul li').click - end + find_tribute_autocomplete_menu.find('li').click - expect(find('.new-note #note-body').value).to include(expected_body) + expect(find_field('Comment').value).to have_text(expected_body) end end @@ -949,42 +785,6 @@ RSpec.describe 'GFM autocomplete', :js do private - def expect_to_wrap(should_wrap, item, note, value) - expect(item).to have_content(value) - expect(item).not_to have_content("\"#{value}\"") - - item.click - - if should_wrap - expect(note.value).to include("\"#{value}\"") - else - expect(note.value).not_to include("\"#{value}\"") - end - end - - def expect_labels(shown: nil, not_shown: nil) - page.within('.atwho-container') do - if shown - expect(page).to have_selector('.atwho-view li', count: shown.size) - shown.each { |label| expect(page).to have_content(label.title) } - end - - if not_shown - expect(page).not_to have_selector('.atwho-view li') unless shown - not_shown.each { |label| expect(page).not_to have_content(label.title) } - end - end - end - - # `note` is a textarea where the given text should be typed. - # We don't want to find it each time this function gets called. - def type(note, text) - page.within('.timeline-content-form') do - note.set('') - note.native.send_keys(text) - end - end - def start_comment_with_emoji(note, selector) note.native.send_keys('Hello :10') @@ -994,9 +794,7 @@ RSpec.describe 'GFM autocomplete', :js do end def start_and_cancel_discussion - click_button('Reply...') - - fill_in('note_note', with: 'Whoops!') + fill_in('Reply to comment', with: 'Whoops!') page.accept_alert 'Are you sure you want to cancel creating this comment?' do click_button('Cancel') @@ -1004,4 +802,20 @@ RSpec.describe 'GFM autocomplete', :js do wait_for_requests end + + def find_autocomplete_menu + find('.atwho-view ul', visible: true) + end + + def find_highlighted_autocomplete_item + find('.atwho-view li.cur', visible: true) + end + + def find_tribute_autocomplete_menu + find('.tribute-container ul', visible: true) + end + + def find_highlighted_tribute_autocomplete_menu + find('.tribute-container li.highlight', visible: true) + end end diff --git a/spec/features/issues/issue_state_spec.rb b/spec/features/issues/issue_state_spec.rb index 409f498798b..d5a115433aa 100644 --- a/spec/features/issues/issue_state_spec.rb +++ b/spec/features/issues/issue_state_spec.rb @@ -42,15 +42,9 @@ RSpec.describe 'issue state', :js do end describe 'when open', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/297348' do - let(:open_issue) { create(:issue, project: project) } - - it_behaves_like 'page with comment and close button', 'Close issue' do - def setup - visit project_issue_path(project, open_issue) - end - end - context 'when clicking the top `Close issue` button', :aggregate_failures do + let(:open_issue) { create(:issue, project: project) } + before do visit project_issue_path(project, open_issue) end @@ -59,8 +53,9 @@ RSpec.describe 'issue state', :js do end context 'when clicking the bottom `Close issue` button', :aggregate_failures do + let(:open_issue) { create(:issue, project: project) } + before do - stub_feature_flags(remove_comment_close_reopen: false) visit project_issue_path(project, open_issue) end @@ -69,15 +64,9 @@ RSpec.describe 'issue state', :js do end describe 'when closed', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/297201' do - let(:closed_issue) { create(:issue, project: project, state: 'closed') } - - it_behaves_like 'page with comment and close button', 'Reopen issue' do - def setup - visit project_issue_path(project, closed_issue) - end - end - context 'when clicking the top `Reopen issue` button', :aggregate_failures do + let(:closed_issue) { create(:issue, project: project, state: 'closed') } + before do visit project_issue_path(project, closed_issue) end @@ -86,8 +75,9 @@ RSpec.describe 'issue state', :js do end context 'when clicking the bottom `Reopen issue` button', :aggregate_failures do + let(:closed_issue) { create(:issue, project: project, state: 'closed') } + before do - stub_feature_flags(remove_comment_close_reopen: false) visit project_issue_path(project, closed_issue) end diff --git a/spec/features/issues/user_interacts_with_awards_spec.rb b/spec/features/issues/user_interacts_with_awards_spec.rb index fec603e466a..1c7bc5f239f 100644 --- a/spec/features/issues/user_interacts_with_awards_spec.rb +++ b/spec/features/issues/user_interacts_with_awards_spec.rb @@ -135,11 +135,9 @@ RSpec.describe 'User interacts with awards' do it 'allows adding a new emoji' do page.within('.note-actions') do - find('a.js-add-award').click - end - page.within('.emoji-menu-content') do - find('gl-emoji[data-name="8ball"]').click + find('.note-emoji-button').click end + find('gl-emoji[data-name="8ball"]').click wait_for_requests page.within('.note-awards') do @@ -157,7 +155,7 @@ RSpec.describe 'User interacts with awards' do end page.within('.note-actions') do - expect(page).not_to have_css('a.js-add-award') + expect(page).not_to have_css('.btn.js-add-award') end end |