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
d7a9dcc1
Commit
d7a9dcc1
authored
Aug 22, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge request diff cache service spec
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
dde44b83
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
...s/merge_requests/merge_request_diff_cache_service_spec.rb
+1
-1
No files found.
spec/services/merge_requests/merge_request_diff_cache_service_spec.rb
View file @
d7a9dcc1
...
@@ -6,7 +6,7 @@ describe MergeRequests::MergeRequestDiffCacheService do
...
@@ -6,7 +6,7 @@ describe MergeRequests::MergeRequestDiffCacheService do
describe
'#execute'
do
describe
'#execute'
do
it
'retrieves the diff files to cache the highlighted result'
do
it
'retrieves the diff files to cache the highlighted result'
do
merge_request
=
create
(
:merge_request
)
merge_request
=
create
(
:merge_request
)
cache_key
=
[
merge_request
.
merge_request_diff
,
'highlighted-diff-files'
,
Gitlab
::
Diff
::
FileCollection
::
MergeRequest
.
default_options
]
cache_key
=
[
merge_request
.
merge_request_diff
,
'highlighted-diff-files'
,
Gitlab
::
Diff
::
FileCollection
::
MergeRequest
Diff
.
default_options
]
expect
(
Rails
.
cache
).
to
receive
(
:read
).
with
(
cache_key
).
and_return
({})
expect
(
Rails
.
cache
).
to
receive
(
:read
).
with
(
cache_key
).
and_return
({})
expect
(
Rails
.
cache
).
to
receive
(
:write
).
with
(
cache_key
,
anything
)
expect
(
Rails
.
cache
).
to
receive
(
:write
).
with
(
cache_key
,
anything
)
...
...
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