summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-11 17:41:57 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-11 17:41:57 +0100
commit37a4f502bee74fae5130e2a518fee8dd335d3789 (patch)
tree38ebedfdf5115cdf855276541af4ecbfbf1f0e31 /spec
parent3082a1195cc0939e0aa0b48a9f59dd84152ebdad (diff)
downloadgitlab-ce-37a4f502bee74fae5130e2a518fee8dd335d3789.tar.gz
Fix resolve spinner and add test
Diffstat (limited to 'spec')
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index 88d28b649a4..0e23c3a8849 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -198,6 +198,8 @@ feature 'Diff notes resolve', feature: true, js: true do
it 'does not mark discussion as resolved when resolving single note' do
page.first '.diff-content .note' do
first('.line-resolve-btn').click
+
+ expect(page).to have_selector('.note-action-button .loading')
expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
end