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
61285da4
Commit
61285da4
authored
Feb 22, 2018
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small review changes
parent
4a802000
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+1
-1
qa/qa/specs/features/ee/merge_request/squash_spec.rb
qa/qa/specs/features/ee/merge_request/squash_spec.rb
+10
-5
qa/qa/specs/features/merge_request/rebase_spec.rb
qa/qa/specs/features/merge_request/rebase_spec.rb
+1
-1
No files found.
qa/qa/page/merge_request/show.rb
View file @
61285da4
...
...
@@ -26,7 +26,7 @@ module QA
end
def
fast_forward_possible?
!
page
.
has_text?
(
"Fast-forward merge is not possible"
)
!
has_text?
(
"Fast-forward merge is not possible"
)
end
def
has_merge_button?
...
...
qa/qa/specs/features/ee/merge_request/squash_spec.rb
View file @
61285da4
...
...
@@ -4,17 +4,22 @@ module QA
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
merge_request
=
Factory
::
Resource
::
MergeRequest
.
fabricate!
do
|
merge_request
|
merge_request
.
title
=
'Squashing commits'
end
project
=
Factory
::
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
"squash-before-merge"
end
merge_request
=
Factory
::
Resource
::
MergeRequest
.
fabricate!
do
|
merge_request
|
merge_request
.
project
=
project
merge_request
.
title
=
'Squashing commits'
end
Factory
::
Repository
::
Push
.
fabricate!
do
|
push
|
push
.
project
=
merge_request
.
project
push
.
project
=
project
push
.
commit_message
=
'to be squashed'
push
.
branch_name
=
merge_request
.
source_branch
push
.
new_branch
=
false
push
.
file_name
=
'other.txt'
push
.
file_content
=
"Test with unicode characters ❤✓€❄"
end
merge_request
.
visit!
...
...
qa/qa/specs/features/merge_request/rebase_spec.rb
View file @
61285da4
...
...
@@ -5,7 +5,7 @@ module QA
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
project
=
Factory
::
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
"
no
-fast-forward"
project
.
name
=
"
only
-fast-forward"
end
Page
::
Menu
::
Side
.
act
{
go_to_settings
}
...
...
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