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
30dd5a65
Commit
30dd5a65
authored
Feb 21, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make fixtures/merge_requests.rb deterministic
parent
fd46e8ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
spec/javascripts/fixtures/merge_requests.rb
spec/javascripts/fixtures/merge_requests.rb
+5
-2
No files found.
spec/javascripts/fixtures/merge_requests.rb
View file @
30dd5a65
...
...
@@ -35,6 +35,7 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
before
do
sign_in
(
admin
)
allow
(
Discussion
).
to
receive
(
:build_discussion_id
).
and_return
([
'discussionid:ceterumcenseo'
])
end
after
do
...
...
@@ -54,8 +55,10 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
end
it
'merge_requests/merged_merge_request.html.raw'
do
|
example
|
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:source_branch_exists?
).
and_return
(
true
)
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:can_remove_source_branch?
).
and_return
(
true
)
expect_next_instance_of
(
MergeRequest
)
do
|
merge_request
|
allow
(
merge_request
).
to
receive
(
:source_branch_exists?
).
and_return
(
true
)
allow
(
merge_request
).
to
receive
(
:can_remove_source_branch?
).
and_return
(
true
)
end
render_merge_request
(
example
.
description
,
merged_merge_request
)
end
...
...
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