Fix resolve spinner and add test
This commit is contained in:
parent
3082a1195c
commit
37a4f502be
|
@ -619,7 +619,6 @@ ul.notes {
|
|||
}
|
||||
|
||||
&:not(.is-disabled):hover,
|
||||
&:not(.is-disabled):focus,
|
||||
&.is-active {
|
||||
color: $gl-text-green;
|
||||
|
||||
|
|
|
@ -52,11 +52,10 @@
|
|||
":aria-label" => "buttonText",
|
||||
"@click" => "resolve",
|
||||
":title" => "buttonText",
|
||||
"v-show" => "!loading",
|
||||
":ref" => "'button'" }
|
||||
= icon("spin spinner", "v-show" => "loading")
|
||||
|
||||
= render "shared/icons/icon_status_success.svg"
|
||||
= icon("spin spinner", "v-show" => "loading", class: 'loading')
|
||||
%div{ 'v-show' => '!loading' }= render "shared/icons/icon_status_success.svg"
|
||||
|
||||
- if current_user
|
||||
- if note.emoji_awardable?
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue