summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorDennis Tang <dennis@dennistang.net>2018-08-20 20:59:11 +0000
committerDennis Tang <dennis@dennistang.net>2018-08-20 20:59:11 +0000
commitfb28b3b375f54a7c14a395eee366cd2509a309be (patch)
tree859f7f3c28cf9012958ae61a834c02e8a0785cd6 /qa/qa.rb
parente8c69b9581436e7bae9a5ff882948efdd66f7e3c (diff)
parent5874b2af0ba3710faf2d247e5a63e867e2b5de7a (diff)
downloadgitlab-ce-44704-improve-project-overview-ui-buttons.tar.gz
Merge branch '44704-improve-project-overview-ui' into '44704-improve-project-overview-ui-buttons'44704-improve-project-overview-ui-buttons
# Conflicts: # app/assets/stylesheets/pages/projects.scss
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 0b48cf58766..4b927067449 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -77,14 +77,16 @@ module QA
#
autoload :Bootable, 'qa/scenario/bootable'
autoload :Actable, 'qa/scenario/actable'
- autoload :Taggable, 'qa/scenario/taggable'
autoload :Template, 'qa/scenario/template'
##
# Test scenario entrypoints.
#
module Test
- autoload :Instance, 'qa/scenario/test/instance'
+ module Instance
+ autoload :All, 'qa/scenario/test/instance/all'
+ autoload :Smoke, 'qa/scenario/test/instance/smoke'
+ end
module Integration
autoload :Github, 'qa/scenario/test/integration/github'