From 6373ef07c74b91b489d58cd9e20f7e5ea4c47664 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 9 Mar 2017 12:29:55 +0100
Subject: [PATCH] Remove EE classes from GitLab QA merged into CE
---
qa/qa.rb | 5 -----
qa/qa/page/admin/license.rb | 20 --------------------
qa/qa/scenario/gitlab/license/add.rb | 21 ---------------------
qa/qa/scenario/test/instance.rb | 5 +++--
4 files changed, 3 insertions(+), 48 deletions(-)
delete mode 100644 qa/qa/page/admin/license.rb
delete mode 100644 qa/qa/scenario/gitlab/license/add.rb
diff --git a/qa/qa.rb b/qa/qa.rb
index bc54f20e17b..7fe18676634 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -34,10 +34,6 @@ module QA
module Project
autoload :Create, 'qa/scenario/gitlab/project/create'
end
-
- module License
- autoload :Add, 'qa/scenario/gitlab/license/add'
- end
end
end
@@ -63,7 +59,6 @@ module QA
module Admin
autoload :Menu, 'qa/page/admin/menu'
- autoload :License, 'qa/page/admin/license'
end
end
diff --git a/qa/qa/page/admin/license.rb b/qa/qa/page/admin/license.rb
deleted file mode 100644
index 4bdfae30b37..00000000000
--- a/qa/qa/page/admin/license.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module QA
- module Page
- module Admin
- class License < Page::Base
- def no_license?
- page.has_content?('No GitLab Enterprise Edition ' \
- 'license has been provided yet')
- end
-
- def add_new_license(key)
- raise 'License key empty!' if key.to_s.empty?
-
- choose 'Enter license key'
- fill_in 'License key', with: key
- click_button 'Upload license'
- end
- end
- end
- end
-end
diff --git a/qa/qa/scenario/gitlab/license/add.rb b/qa/qa/scenario/gitlab/license/add.rb
deleted file mode 100644
index ca5e1176959..00000000000
--- a/qa/qa/scenario/gitlab/license/add.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module QA
- module Scenario
- module Gitlab
- module License
- class Add < Scenario::Template
- def perform
- Page::Main::Entry.act { sign_in_using_credentials }
- Page::Main::Menu.act { go_to_admin_area }
- Page::Admin::Menu.act { go_to_license }
-
- Page::Admin::License.act do
- add_new_license(ENV['EE_LICENSE']) if no_license?
- end
-
- Page::Main::Menu.act { sign_out }
- end
- end
- end
- end
- end
-end
diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb
index dcd0a32d79d..1557fdeff34 100644
--- a/qa/qa/scenario/test/instance.rb
+++ b/qa/qa/scenario/test/instance.rb
@@ -12,8 +12,9 @@ module QA
end
##
- # Temporary CE + EE support
- Scenario::Gitlab::License::Add.perform if tag.to_s == 'ee'
+ # Perform before hooks, which are different for CE and EE
+ #
+ Runtime::Release.perform_before_hooks
Specs::Runner.perform do |specs|
files = files.any? ? files : 'qa/specs/features'
--
GitLab