summaryrefslogtreecommitdiff
path: root/qa/qa/scenario
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-20 12:21:56 +0000
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-11-22 11:18:07 +0100
commitdabd858812c6d342d095c69ef85aeba7af894121 (patch)
treec94cca8c978b755591b3eff61f6fba2a1e046f81 /qa/qa/scenario
parent6369db0196ec7b6e288b16382c95243424a59b62 (diff)
downloadgitlab-ce-dabd858812c6d342d095c69ef85aeba7af894121.tar.gz
Backport QA code that belongs to CE from EE Geoqa/gb/backport-geo-integration-tests-commons
Merge branch 'qa/gb/add-geo-integration-tests' into 'master' See merge request gitlab-org/gitlab-ee!3294
Diffstat (limited to 'qa/qa/scenario')
-rw-r--r--qa/qa/scenario/bootable.rb2
-rw-r--r--qa/qa/scenario/gitlab/admin/hashed_storage.rb25
2 files changed, 26 insertions, 1 deletions
diff --git a/qa/qa/scenario/bootable.rb b/qa/qa/scenario/bootable.rb
index cf8996cd597..d6de4d404c8 100644
--- a/qa/qa/scenario/bootable.rb
+++ b/qa/qa/scenario/bootable.rb
@@ -28,7 +28,7 @@ module QA
private
- def attribute(name, arg, desc)
+ def attribute(name, arg, desc = '')
options.push(Option.new(name, arg, desc))
end
diff --git a/qa/qa/scenario/gitlab/admin/hashed_storage.rb b/qa/qa/scenario/gitlab/admin/hashed_storage.rb
new file mode 100644
index 00000000000..ac2cd549829
--- /dev/null
+++ b/qa/qa/scenario/gitlab/admin/hashed_storage.rb
@@ -0,0 +1,25 @@
+module QA
+ module Scenario
+ module Gitlab
+ module Admin
+ class HashedStorage < Scenario::Template
+ def perform(*traits)
+ raise ArgumentError unless traits.include?(:enabled)
+
+ Page::Main::Entry.act { visit_login_page }
+ Page::Main::Login.act { sign_in_using_credentials }
+ Page::Main::Menu.act { go_to_admin_area }
+ Page::Admin::Menu.act { go_to_settings }
+
+ Page::Admin::Settings.act do
+ enable_hashed_storage
+ save_settings
+ end
+
+ QA::Page::Main::Menu.act { sign_out }
+ end
+ end
+ end
+ end
+ end
+end