BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 8b0cdf4c by Douwe Maan
Options

Merge branch '23875-fixup-failing-spec' into 'master'

Prevent a spec from failing in `spec/features/merge_requests/diff_notes_resolve_spec.rb` ## What does this MR do? Fixes a failing spec in `spec/features/merge_requests/diff_notes_resolve_spec.rb` ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Tests failing on master. RSpec executes inner `before` blocks after outer `before` blocks, so the second note was being added *after* loading the page, and then being pulled in by running JS on the page, causing intermittent failures if we clicked the resolve button before the note was loaded. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23875 See merge request !7150
parents 66870960 671556c6
Showing with 6 additions and 4 deletions
spec/features/merge_requests/diff_notes_resolve_spec.rb
...@@ -194,12 +194,12 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -194,12 +194,12 @@ feature 'Diff notes resolve', feature: true, js: true do
context 'multiple notes' do context 'multiple notes' do
before do before do
create(:diff_note_on_merge_request, project: project, noteable: merge_request) create(:diff_note_on_merge_request, project: project, noteable: merge_request)
visit_merge_request
end end
it 'does not mark discussion as resolved when resolving single note' do it 'does not mark discussion as resolved when resolving single note' do
page.within '.diff-content .note' do page.first '.diff-content .note' do
first('.line-resolve-btn').click first('.line-resolve-btn').click
sleep 1
expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}") expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
end end
...@@ -212,7 +212,9 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -212,7 +212,9 @@ feature 'Diff notes resolve', feature: true, js: true do
it 'resolves discussion' do it 'resolves discussion' do
page.all('.note').each do |note| page.all('.note').each do |note|
note.find('.line-resolve-btn').click note.all('.line-resolve-btn').each do |button|
button.click
end
end end
expect(page).to have_content('Resolved by') expect(page).to have_content('Resolved by')
...@@ -292,7 +294,7 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -292,7 +294,7 @@ feature 'Diff notes resolve', feature: true, js: true do
expect(holder).to have_selector('.discussion-next-btn') expect(holder).to have_selector('.discussion-next-btn')
end end
end end
it 'displays next discussion even if hidden' do it 'displays next discussion even if hidden' do
page.all('.note-discussion').each do |discussion| page.all('.note-discussion').each do |discussion|
page.within discussion do page.within discussion do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment