diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 15:08:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 15:08:44 +0300 |
| commit | db24ab2b72dbff24c201410a0561e929ae7e8061 (patch) | |
| tree | 67297286aad8cc590ae325330a0bfe1e2a7e51dc /qa | |
| parent | 7e8278c0f46cf6058efad5afd0aef177977bd663 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/flow/login.rb | 6 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/qa/qa/flow/login.rb b/qa/qa/flow/login.rb index 30137571dbd..5505fabd4ae 100644 --- a/qa/qa/flow/login.rb +++ b/qa/qa/flow/login.rb @@ -12,12 +12,6 @@ module QA yield - # Workaround for a bug preventing sign out from secondary nodes - # See https://gitlab.com/gitlab-org/gitlab/issues/198289 - if address == :geo_secondary - Runtime::Browser.visit(:geo_primary, Page::Dashboard::Projects) - end - Page::Main::Menu.perform(&:sign_out) end diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb index 70b571a316a..7c9db5ee496 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196034' do + context 'Create' do describe 'Web IDE file templates' do include Runtime::Fixtures |