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
3251902b
Commit
3251902b
authored
Jul 19, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix stubbing on method defined in a prepended module
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
0c6505c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/presenters/merge_request_presenter_spec.rb
spec/presenters/merge_request_presenter_spec.rb
+2
-2
No files found.
spec/presenters/merge_request_presenter_spec.rb
View file @
3251902b
...
...
@@ -392,7 +392,7 @@ describe MergeRequestPresenter do
before
do
allow
(
resource
).
to
receive
(
:source_branch_exists?
)
{
source_branch_exists
}
allow_any_instance_of
(
::
Gitlab
::
UserAccess
)
allow_any_instance_of
(
Gitlab
::
UserAccess
::
RequestCacheExtension
)
.
to
receive
(
:can_push_to_branch?
)
.
with
(
resource
.
source_branch
)
.
and_return
(
can_push_to_branch
)
...
...
@@ -462,7 +462,7 @@ describe MergeRequestPresenter do
allow
(
resource
).
to
receive
(
:rebase_in_progress?
)
{
rebase_in_progress
}
allow
(
resource
).
to
receive
(
:should_be_rebased?
)
{
should_be_rebased
}
allow_any_instance_of
(
::
Gitlab
::
UserAccess
)
allow_any_instance_of
(
Gitlab
::
UserAccess
::
RequestCacheExtension
)
.
to
receive
(
:can_push_to_branch?
)
.
with
(
resource
.
source_branch
)
.
and_return
(
can_push_to_branch
)
...
...
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