Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6373ef07
Commit
6373ef07
authored
Mar 09, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE classes from GitLab QA merged into CE
parent
92c3a994
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
48 deletions
+3
-48
qa/qa.rb
qa/qa.rb
+0
-5
qa/qa/page/admin/license.rb
qa/qa/page/admin/license.rb
+0
-20
qa/qa/scenario/gitlab/license/add.rb
qa/qa/scenario/gitlab/license/add.rb
+0
-21
qa/qa/scenario/test/instance.rb
qa/qa/scenario/test/instance.rb
+3
-2
No files found.
qa/qa.rb
View file @
6373ef07
...
...
@@ -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
...
...
qa/qa/page/admin/license.rb
deleted
100644 → 0
View file @
92c3a994
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
qa/qa/scenario/gitlab/license/add.rb
deleted
100644 → 0
View file @
92c3a994
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
qa/qa/scenario/test/instance.rb
View file @
6373ef07
...
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment