BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8dd1a6fc
Commit
8dd1a6fc
authored
Apr 13, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the rubocop check.
parent
66ca8018
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
issue_spec.rb
spec/models/issue_spec.rb
+3
-2
No files found.
spec/models/issue_spec.rb
View file @
8dd1a6fc
...
@@ -192,8 +192,6 @@ describe Issue, models: true do
...
@@ -192,8 +192,6 @@ describe Issue, models: true do
describe
'#related_branches'
do
describe
'#related_branches'
do
let
(
:user
)
{
build
(
:user
,
:admin
)
}
let
(
:user
)
{
build
(
:user
,
:admin
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
description:
"Closes #
#{
subject
.
iid
}
"
,
source_project:
subject
.
project
,
source_branch:
"branch-
#{
subject
.
iid
}
"
)
}
before
(
:each
)
do
before
(
:each
)
do
allow
(
subject
.
project
.
repository
).
to
receive
(
:branch_names
).
allow
(
subject
.
project
.
repository
).
to
receive
(
:branch_names
).
...
@@ -210,6 +208,9 @@ describe Issue, models: true do
...
@@ -210,6 +208,9 @@ describe Issue, models: true do
end
end
it
"selects the right branches when there is a referenced merge request"
do
it
"selects the right branches when there is a referenced merge request"
do
merge_request
=
create
(
:merge_request
,
{
description:
"Closes #
#{
subject
.
iid
}
"
,
source_project:
subject
.
project
,
source_branch:
"branch-
#{
subject
.
iid
}
"
})
merge_request
.
create_cross_references!
(
user
)
merge_request
.
create_cross_references!
(
user
)
expect
(
subject
.
referenced_merge_requests
).
to_not
be_empty
expect
(
subject
.
referenced_merge_requests
).
to_not
be_empty
expect
(
subject
.
related_branches
(
user
)).
to
eq
([
subject
.
to_branch_name
])
expect
(
subject
.
related_branches
(
user
)).
to
eq
([
subject
.
to_branch_name
])
...
...
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