summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/diff_notes_resolve_spec.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-01 10:06:31 +0100
committerPhil Hughes <me@iamphill.com>2016-08-01 10:06:31 +0100
commitc51cbc1f2f3b590c4f38198dd886c4e372b4e476 (patch)
tree5c4b1e26c68b810fa46bf42d200bf2f30e452f10 /spec/features/merge_requests/diff_notes_resolve_spec.rb
parentdb8c4bce381a137d7afea99d39ffd4d5e70b5580 (diff)
downloadgitlab-ce-c51cbc1f2f3b590c4f38198dd886c4e372b4e476.tar.gz
Updated issues with jump tp button
Fixed styling bugs
Diffstat (limited to 'spec/features/merge_requests/diff_notes_resolve_spec.rb')
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index 0216a8f91af..79264a1f26a 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -116,15 +116,16 @@ feature 'Diff notes resolve', feature: true, js: true do
it 'allows user to unresolve from reply form without a comment' do
page.within '.diff-content' do
click_button 'Resolve discussion'
+ sleep 1
click_button 'Reply...'
- click_button 'Resolve discussion'
+ click_button 'Unresolve discussion'
end
page.within '.line-resolve-all-container' do
expect(page).to have_content('0/1 discussion resolved')
- expect(page).to have_selector('.line-resolve-btn.is-active')
+ expect(page).not_to have_selector('.line-resolve-btn.is-active')
end
end