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
Boxiang Sun
gitlab-ce
Commits
19a62632
Commit
19a62632
authored
Sep 20, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add spec for Project#merge_method
It should be deleted from EE side when doing CE->EE merge!
parent
3940ac85
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
spec/models/project_spec.rb
spec/models/project_spec.rb
+12
-0
No files found.
spec/models/project_spec.rb
View file @
19a62632
...
@@ -408,6 +408,18 @@ describe Project do
...
@@ -408,6 +408,18 @@ describe Project do
end
end
end
end
describe
'#merge_method'
do
it
'returns "ff" merge_method when ff is enabled'
do
project
=
build
(
:project
,
merge_requests_ff_only_enabled:
true
)
expect
(
project
.
merge_method
).
to
be
:ff
end
it
'returns "merge" merge_method when ff is disabled'
do
project
=
build
(
:project
,
merge_requests_ff_only_enabled:
false
)
expect
(
project
.
merge_method
).
to
be
:merge
end
end
describe
'#repository_storage_path'
do
describe
'#repository_storage_path'
do
let
(
:project
)
{
create
(
:project
,
repository_storage:
'custom'
)
}
let
(
:project
)
{
create
(
:project
,
repository_storage:
'custom'
)
}
...
...
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