Commit 9c071619 authored by Tomislav Nikic's avatar Tomislav Nikic

Adding selectors for badges

This makes it possible to check if it is still working.
If it is done, check if there are <count> badges.
parent 8abd656e
...@@ -134,8 +134,14 @@ export default { ...@@ -134,8 +134,14 @@ export default {
<gl-icon name="question-o" css-classes="link-highlight" /> <gl-icon name="question-o" css-classes="link-highlight" />
</a> </a>
</div> </div>
<div v-if="isApplied" class="badge badge-success">{{ __('Applied') }}</div> <div v-if="isApplied" class="badge badge-success" data-qa-selector="applied_badge">
<div v-else-if="isApplying" class="d-flex align-items-center text-secondary"> {{ __('Applied') }}
</div>
<div
v-else-if="isApplying"
class="d-flex align-items-center text-secondary"
data-qa-selector="applying_badge"
>
<gl-loading-icon size="sm" class="d-flex-center mr-2" /> <gl-loading-icon size="sm" class="d-flex-center mr-2" />
<span>{{ applyingSuggestionsMessage }}</span> <span>{{ applyingSuggestionsMessage }}</span>
</div> </div>
......
...@@ -99,6 +99,8 @@ module QA ...@@ -99,6 +99,8 @@ module QA
view 'app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue' do view 'app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue' do
element :add_suggestion_batch_button element :add_suggestion_batch_button
element :applied_badge
element :applying_badge
end end
view 'app/views/projects/merge_requests/_description.html.haml' do view 'app/views/projects/merge_requests/_description.html.haml' do
...@@ -363,6 +365,13 @@ module QA ...@@ -363,6 +365,13 @@ module QA
all_elements(:add_suggestion_batch_button, minimum: 1).first.click all_elements(:add_suggestion_batch_button, minimum: 1).first.click
end end
def has_suggestions_applied?(count)
wait_until(reload: false) do
has_no_element?(:applying_badge)
end
all_elements(:applied_badge, count: count)
end
def cherry_pick! def cherry_pick!
click_element(:cherry_pick_button, Page::Component::CommitModal) click_element(:cherry_pick_button, Page::Component::CommitModal)
click_element(:submit_commit_button) click_element(:submit_commit_button)
......
...@@ -52,7 +52,7 @@ module QA ...@@ -52,7 +52,7 @@ module QA
4.times { merge_request.add_suggestion_to_batch } 4.times { merge_request.add_suggestion_to_batch }
merge_request.apply_suggestion_with_message("Custom commit message") merge_request.apply_suggestion_with_message("Custom commit message")
expect(merge_request).to have_css('.badge-success', text: "Applied", count: 4) expect(merge_request).to have_suggestions_applied(4)
end end
end end
end end
......
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