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
40f8d5dc
Commit
40f8d5dc
authored
Dec 13, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
08454395
352fe162
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
qa/qa/resource/repository/project_push.rb
qa/qa/resource/repository/project_push.rb
+5
-0
qa/qa/resource/repository/wiki_push.rb
qa/qa/resource/repository/wiki_push.rb
+5
-0
qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb
...ate/repository/user_views_raw_diff_patch_requests_spec.rb
+2
-2
No files found.
qa/qa/resource/repository/project_push.rb
View file @
40f8d5dc
...
@@ -26,6 +26,11 @@ module QA
...
@@ -26,6 +26,11 @@ module QA
def
repository_ssh_uri
def
repository_ssh_uri
@repository_ssh_uri
||=
project
.
repository_ssh_location
.
uri
@repository_ssh_uri
||=
project
.
repository_ssh_location
.
uri
end
end
def
fabricate!
super
project
.
visit!
end
end
end
end
end
end
end
...
...
qa/qa/resource/repository/wiki_push.rb
View file @
40f8d5dc
...
@@ -30,6 +30,11 @@ module QA
...
@@ -30,6 +30,11 @@ module QA
end
end
end
end
end
end
def
fabricate!
super
wiki
.
visit!
end
end
end
end
end
end
end
...
...
qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb
View file @
40f8d5dc
...
@@ -7,17 +7,17 @@ module QA
...
@@ -7,17 +7,17 @@ module QA
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
@project
=
Resource
::
Repository
::
ProjectPush
.
fabricate!
do
|
push
|
project_push
=
Resource
::
Repository
::
ProjectPush
.
fabricate!
do
|
push
|
push
.
file_name
=
'README.md'
push
.
file_name
=
'README.md'
push
.
file_content
=
'# This is a test project'
push
.
file_content
=
'# This is a test project'
push
.
commit_message
=
'Add README.md'
push
.
commit_message
=
'Add README.md'
end
end
@project
=
project_push
.
project
# first file added has no parent commit, thus no diff data
# first file added has no parent commit, thus no diff data
# add second file to repo to enable diff from initial commit
# add second file to repo to enable diff from initial commit
@commit_message
=
'Add second file'
@commit_message
=
'Add second file'
@project
.
visit!
Page
::
Project
::
Show
.
perform
(
&
:create_new_file!
)
Page
::
Project
::
Show
.
perform
(
&
:create_new_file!
)
Page
::
File
::
Form
.
perform
do
|
f
|
Page
::
File
::
Form
.
perform
do
|
f
|
f
.
add_name
(
'second'
)
f
.
add_name
(
'second'
)
...
...
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