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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d631056c
Commit
d631056c
authored
Mar 19, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not add EE license if not set in GitLab QA tests
parent
30ae11c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
qa/qa/ee/scenario/license/add.rb
qa/qa/ee/scenario/license/add.rb
+3
-3
qa/qa/ee/strategy.rb
qa/qa/ee/strategy.rb
+4
-1
No files found.
qa/qa/ee/scenario/license/add.rb
View file @
d631056c
...
...
@@ -3,13 +3,13 @@ module QA
module
Scenario
module
License
class
Add
<
QA
::
Scenario
::
Template
def
perform
def
perform
(
license
)
QA
::
Page
::
Main
::
Entry
.
act
{
sign_in_using_credentials
}
QA
::
Page
::
Main
::
Menu
.
act
{
go_to_admin_area
}
QA
::
Page
::
Admin
::
Menu
.
act
{
go_to_license
}
EE
::
Page
::
Admin
::
License
.
act
do
add_new_license
(
ENV
[
'EE_LICENSE'
]
)
if
no_license?
EE
::
Page
::
Admin
::
License
.
act
(
license
)
do
|
key
|
add_new_license
(
key
)
if
no_license?
end
QA
::
Page
::
Main
::
Menu
.
act
{
sign_out
}
...
...
qa/qa/ee/strategy.rb
View file @
d631056c
...
...
@@ -2,12 +2,15 @@ module QA
module
EE
module
Strategy
extend
self
def
extend_autoloads!
require
'qa/ee'
end
def
perform_before_hooks
EE
::
Scenario
::
License
::
Add
.
perform
return
unless
ENV
[
'EE_LICENSE'
]
EE
::
Scenario
::
License
::
Add
.
perform
(
ENV
[
'EE_LICENSE'
])
rescue
Capybara
::
Screenshot
.
screenshot_and_save_page
raise
...
...
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