summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamya Authappan <rauthappan@gitlab.com>2019-06-27 06:19:14 +0000
committerRamya Authappan <rauthappan@gitlab.com>2019-06-27 06:19:14 +0000
commit547055db58447017f33771c913edd296a3f58e35 (patch)
tree0d5b12928b27c6b8aca2130f7c4cfc2d61e9f727
parent19cb7642423e6b9e85fa7fc75c0f3b36e408e9f2 (diff)
parent8e57a731d98bb7f96ef00e5218680d422adf29f6 (diff)
downloadgitlab-ce-547055db58447017f33771c913edd296a3f58e35.tar.gz
Merge branch 'qa-ml-unquarantine-add-file-template-tests' into 'master'
Unquarantine fixed tests See merge request gitlab-org/gitlab-ce!30109
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb3
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb3
2 files changed, 2 insertions, 4 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
index 2750b171a85..567c6a83ddf 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb
@@ -2,8 +2,7 @@
module QA
context 'Create' do
- # Issue: https://gitlab.com/gitlab-org/quality/nightly/issues/97
- describe 'File templates', :quarantine do
+ describe 'File templates' do
include Runtime::Fixtures
def login
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 078d3b2b5b1..c09c65a57a5 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,8 +1,7 @@
# frozen_string_literal: true
module QA
- # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/46
- context 'Create', :quarantine do
+ context 'Create' do
describe 'Web IDE file templates' do
include Runtime::Fixtures