summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-20 16:28:54 +0000
committerRémy Coutable <remy@rymai.me>2017-11-20 16:28:54 +0000
commit026ab92ad057bc69af78035582bc0dc147bcec30 (patch)
tree33b10db3b159f9aad91abfa36bef88dc9ced0540 /qa
parent6de494007769218de760cf31216f2b295e38ab9a (diff)
parentef0f54232c777341e914d9cb45d8164057e65bc0 (diff)
downloadgitlab-ce-026ab92ad057bc69af78035582bc0dc147bcec30.tar.gz
Merge branch 'qa/gb/tmp-fix-mattermost-failures' into 'master'
Implement a workaround for QA mattermost failures Closes gitlab-qa#102 See merge request gitlab-org/gitlab-ce!15486
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/specs/features/mattermost/login_spec.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/qa/qa/specs/features/mattermost/login_spec.rb b/qa/qa/specs/features/mattermost/login_spec.rb
index 92f91cb2725..1fde3f89a99 100644
--- a/qa/qa/specs/features/mattermost/login_spec.rb
+++ b/qa/qa/specs/features/mattermost/login_spec.rb
@@ -9,5 +9,16 @@ module QA
expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
end
end
+
+ ##
+ # TODO, temporary workaround for gitlab-org/gitlab-qa#102.
+ #
+ after do
+ visit Runtime::Scenario.mattermost_address
+ reset_session!
+
+ visit Runtime::Scenario.gitlab_address
+ reset_session!
+ end
end
end