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
74bb2e72
Commit
74bb2e72
authored
Jun 19, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails5 fix Projects::PagesController spec
parent
e0da61bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/rails5-fix-pages-controller.yml
changelogs/unreleased/rails5-fix-pages-controller.yml
+5
-0
spec/controllers/projects/pages_controller_spec.rb
spec/controllers/projects/pages_controller_spec.rb
+2
-2
No files found.
changelogs/unreleased/rails5-fix-pages-controller.yml
0 → 100644
View file @
74bb2e72
---
title
:
Rails5 fix Projects::PagesController spec
merge_request
:
20007
author
:
Jasper Maes
type
:
fixed
spec/controllers/projects/pages_controller_spec.rb
View file @
74bb2e72
...
@@ -71,7 +71,7 @@ describe Projects::PagesController do
...
@@ -71,7 +71,7 @@ describe Projects::PagesController do
{
{
namespace_id:
project
.
namespace
,
namespace_id:
project
.
namespace
,
project_id:
project
,
project_id:
project
,
project:
{
pages_https_only:
false
}
project:
{
pages_https_only:
'false'
}
}
}
end
end
...
@@ -96,7 +96,7 @@ describe Projects::PagesController do
...
@@ -96,7 +96,7 @@ describe Projects::PagesController do
it
'calls the update service'
do
it
'calls the update service'
do
expect
(
Projects
::
UpdateService
)
expect
(
Projects
::
UpdateService
)
.
to
receive
(
:new
)
.
to
receive
(
:new
)
.
with
(
project
,
user
,
request_params
[
:project
]
)
.
with
(
project
,
user
,
ActionController
::
Parameters
.
new
(
request_params
[
:project
]).
permit!
)
.
and_return
(
update_service
)
.
and_return
(
update_service
)
patch
:update
,
request_params
patch
:update
,
request_params
...
...
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