diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-13 15:36:03 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-13 15:36:03 +0000 |
| commit | 178efad07408e819447a7340ca7dfc641856af03 (patch) | |
| tree | 20d55ef4ee7475feecff072c656209553e0cb984 /spec | |
| parent | 2beabafaada98db4d45d25d42ebe373ad3d690e4 (diff) | |
| parent | 66cf90f36b0ee1c45da858d525dcc402d2b13f6b (diff) | |
| download | gitlab-ce-178efad07408e819447a7340ca7dfc641856af03.tar.gz | |
Merge branch '30622-resolve-note-loading-icon-gone' into 'master'
Resolve "Resolve note loading icon gone"
Closes #30622
See merge request !10628
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/merge_requests/diff_notes_resolve_spec.rb | 2 |
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 |