summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-09-03 08:25:05 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-09-03 08:25:05 +0000
commitd76b23af39bf4e6f7939481a13bbf3c56d105258 (patch)
tree247a377cb0bf2b7a76e4fb3d18de56271281a820 /qa
parentd79218fcea1fb4a85f4155e0cc3638e17a600249 (diff)
parent61b5fd8d8c159c2cd6189f6494eaa63d6d8c91dc (diff)
downloadgitlab-ce-d76b23af39bf4e6f7939481a13bbf3c56d105258.tar.gz
Merge branch 'qa-cleanup-after-reorganization' into 'master'
[QA] Remove the :core tag since we're not using it anymore See merge request gitlab-org/gitlab-ce!21436
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/scenario/test/integration/mattermost.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/scenario/test/integration/mattermost.rb b/qa/qa/scenario/test/integration/mattermost.rb
index 831c6a9fcff..ece6fba75c9 100644
--- a/qa/qa/scenario/test/integration/mattermost.rb
+++ b/qa/qa/scenario/test/integration/mattermost.rb
@@ -7,7 +7,7 @@ module QA
# including staging and on-premises installation.
#
class Mattermost < Test::Instance::All
- tags :core, :mattermost
+ tags :mattermost
def perform(address, mattermost, *rspec_options)
Runtime::Scenario.define(:mattermost_address, mattermost)
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
index f18655442c1..82d635065a0 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module QA
- context :create, :core do
+ context :create do
describe 'Files management' do
it 'user creates, edits and deletes a file via the Web' do
Runtime::Browser.visit(:gitlab, Page::Main::Login)