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
0659bd51
Commit
0659bd51
authored
Jul 11, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
1a4718d8
38ff4498
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
...r_ui/3_create/repository/add_list_delete_branches_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_ci_variable_spec.rb
...s/browser_ui/4_verify/ci_variable/add_ci_variable_spec.rb
+2
-2
qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
...rowser_ui/6_release/deploy_token/add_deploy_token_spec.rb
+1
-1
No files found.
qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
View file @
0659bd51
...
...
@@ -56,7 +56,7 @@ module QA
project
.
visit!
end
it
'
branches are correctly listed
after CRUD operations'
do
it
'
lists branches correctly
after CRUD operations'
do
Page
::
Project
::
Menu
.
perform
(
&
:go_to_repository_branches
)
expect
(
page
).
to
have_content
(
master_branch
)
...
...
qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_ci_variable_spec.rb
View file @
0659bd51
...
...
@@ -7,12 +7,12 @@ module QA
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
project
=
Resource
::
Project
.
fabricate!
do
|
project
|
project
=
Resource
::
Project
.
fabricate
_via_api
!
do
|
project
|
project
.
name
=
'project-with-ci-variables'
project
.
description
=
'project with CI variables'
end
Resource
::
CiVariable
.
fabricate!
do
|
resource
|
Resource
::
CiVariable
.
fabricate
_via_api
!
do
|
resource
|
resource
.
project
=
project
resource
.
key
=
'VARIABLE_KEY'
resource
.
value
=
'some_CI_variable'
...
...
qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
View file @
0659bd51
...
...
@@ -10,7 +10,7 @@ module QA
deploy_token_name
=
'deploy token name'
one_week_from_now
=
Date
.
today
+
7
deploy_token
=
Resource
::
DeployToken
.
fabricate!
do
|
resource
|
deploy_token
=
Resource
::
DeployToken
.
fabricate
_via_browser_ui
!
do
|
resource
|
resource
.
name
=
deploy_token_name
resource
.
expires_at
=
one_week_from_now
end
...
...
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