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
Jérome Perrin
gitlab-ce
Commits
abd2bc00
Commit
abd2bc00
authored
Jul 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some of tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
989329c9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
spec/models/project_services/slack_service_spec.rb
spec/models/project_services/slack_service_spec.rb
+1
-1
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+2
-2
spec/support/mentionable_shared_examples.rb
spec/support/mentionable_shared_examples.rb
+1
-1
No files found.
spec/models/project_services/slack_service_spec.rb
View file @
abd2bc00
...
...
@@ -67,7 +67,7 @@ describe SlackService do
opts
=
{
title:
'Awesome merge_request'
,
description:
'please fix'
,
source_branch:
'
stabl
e'
,
source_branch:
'
featur
e'
,
target_branch:
'master'
}
merge_service
=
MergeRequests
::
CreateService
.
new
(
project
,
...
...
spec/models/repository_spec.rb
View file @
abd2bc00
...
...
@@ -36,13 +36,13 @@ describe Repository do
describe
:can_be_merged?
do
context
'mergeable branches'
do
subject
{
repository
.
can_be_merged?
(
'
feature
'
,
'master'
)
}
subject
{
repository
.
can_be_merged?
(
'
0b4bc9a49b562e85de7cc9e834518ea6828729b9
'
,
'master'
)
}
it
{
is_expected
.
to
be_truthy
}
end
context
'non-mergeable branches'
do
subject
{
repository
.
can_be_merged?
(
'
feature_conflict
'
,
'feature'
)
}
subject
{
repository
.
can_be_merged?
(
'
bb5206fee213d983da88c47f9cf4cc6caf9c66dc
'
,
'feature'
)
}
it
{
is_expected
.
to
be_falsey
}
end
...
...
spec/support/mentionable_shared_examples.rb
View file @
abd2bc00
...
...
@@ -9,7 +9,7 @@ def common_mentionable_setup
let
(
:author
)
{
subject
.
author
}
let
(
:mentioned_issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:mentioned_mr
)
{
create
(
:merge_request
,
:simple
,
source_project:
project
)
}
let
!
(
:mentioned_mr
)
{
create
(
:merge_request
,
:simple
,
source_project:
project
)
}
let
(
:mentioned_commit
)
{
project
.
commit
}
let
(
:ext_proj
)
{
create
(
:project
,
:public
)
}
...
...
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