summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanad Liaquat <sliaquat@gitlab.com>2019-07-30 04:35:39 +0000
committerSanad Liaquat <sliaquat@gitlab.com>2019-07-30 04:35:39 +0000
commit52af120fcbd84e743d2d0cf726cdd579a0785cd5 (patch)
tree5ff1ef1a3c2ebd5a7c07e737048d363f8c117ffb
parent6b025c1765d478813fe2fc0131fc4f6fb7eec42b (diff)
parent63f395f96ef6bb96fee7ce7eb7672b0a8f7d6d1e (diff)
downloadgitlab-ce-52af120fcbd84e743d2d0cf726cdd579a0785cd5.tar.gz
Merge branch 'qa-mattermost-spec-retry' into 'master'
Add retry on exception to mattermost login spec See merge request gitlab-org/gitlab-ce!31243
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
index 67610b62ed7..0a999cf00fa 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
@@ -7,11 +7,13 @@ module QA
Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.perform(&:sign_in_using_credentials)
- Runtime::Browser.visit(:mattermost, Page::Mattermost::Login)
- Page::Mattermost::Login.perform(&:sign_in_using_oauth)
+ Support::Retrier.retry_on_exception do
+ Runtime::Browser.visit(:mattermost, Page::Mattermost::Login)
+ Page::Mattermost::Login.perform(&:sign_in_using_oauth)
- Page::Mattermost::Main.perform do |page|
- expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
+ Page::Mattermost::Main.perform do |page|
+ expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
+ end
end
end
end