Commit 52b9cead authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-fix-pages-controller' into 'master'

Rails5 fix Projects::PagesController spec

See merge request gitlab-org/gitlab-ce!20007
parents ed2fde00 74bb2e72
---
title: Rails5 fix Projects::PagesController spec
merge_request: 20007
author: Jasper Maes
type: fixed
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment