kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove EE classes from GitLab QA merged into CE

Browse source
This commit is contained in:
Grzegorz Bizon 2017-03-09 12:29:55 +01:00
parent 92c3a9941c
commit 6373ef07c7
4 changed files with 3 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qa/qa.rb
View file

@ -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

20
qa/qa/page/admin/license.rb
View file

@ -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

21
qa/qa/scenario/gitlab/license/add.rb
View file

@ -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

5
qa/qa/scenario/test/instance.rb
View file

@ -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'