From 787ee648160d09d997f576dff723e578bba42bbf Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Mon, 4 Jul 2022 10:16:02 +0000
Subject: [PATCH] Merge branch 'pl-spec-flaky-request-user-awards' into
'master'
Fix flaky feature specs for "user awards emoji"
See merge request gitlab-org/gitlab!91630
(cherry picked from commit 6e6b869cb0f627381b6eb35fd3d3fa49bbb5db01)
771c70ae Fix flaky feature specs for "user awards emoji"
---
spec/features/merge_request/user_awards_emoji_spec.rb | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/spec/features/merge_request/user_awards_emoji_spec.rb b/spec/features/merge_request/user_awards_emoji_spec.rb
index 81a88cad458a..6fdc1a291742 100644
--- a/spec/features/merge_request/user_awards_emoji_spec.rb
+++ b/spec/features/merge_request/user_awards_emoji_spec.rb
@@ -11,27 +11,35 @@
describe 'logged in' do
before do
sign_in(user)
- visit project_merge_request_path(project, merge_request)
+ visit project_merge_request_path(project, merge_request)
wait_for_requests
end
it 'adds award to merge request' do
first('[data-testid="award-button"]').click
+ wait_for_requests
expect(page).to have_selector('[data-testid="award-button"].selected')
expect(first('[data-testid="award-button"]')).to have_content '1'
visit project_merge_request_path(project, merge_request)
+ wait_for_requests
+
expect(first('[data-testid="award-button"]')).to have_content '1'
end
it 'removes award from merge request' do
first('[data-testid="award-button"]').click
+ wait_for_requests
expect(first('[data-testid="award-button"]')).to have_content '1'
+
find('[data-testid="award-button"].selected').click
+ wait_for_requests
expect(first('[data-testid="award-button"]')).to have_content '0'
visit project_merge_request_path(project, merge_request)
+ wait_for_requests
+
expect(first('[data-testid="award-button"]')).to have_content '0'
end
@@ -62,6 +70,7 @@
describe 'logged out' do
before do
visit project_merge_request_path(project, merge_request)
+ wait_for_requests
end
it 'does not see award menu button' do
--
GitLab