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
Léo-Paul Géneau
gitlab-ce
Commits
3ea1f91e
Commit
3ea1f91e
authored
Feb 07, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge request controller specs for new action
parent
1d0820c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+7
-1
No files found.
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
3ea1f91e
...
...
@@ -33,11 +33,17 @@ describe Projects::MergeRequestsController do
end
context
'when rendering JSON response'
do
before
do
create
(
:ci_pipeline
,
sha:
fork_project
.
commit
(
'remove-submodule'
).
id
,
ref:
'remove-submodule'
,
project:
fork_project
)
end
it
'renders JSON including serialized pipelines'
do
submit_new_merge_request
(
format: :json
)
expect
(
json_response
).
to
have_key
(
'pipelines'
)
expect
(
response
).
to
be_ok
expect
(
json_response
).
not_to
be_empty
end
end
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