kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Rails5 fix Projects::PagesController spec

See merge request gitlab-org/gitlab-ce!20007
This commit is contained in:
Rémy Coutable 2018-06-20 09:59:30 +00:00
parent ed2fde0071 74bb2e728b
commit 52b9cead80
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/rails5-fix-pages-controller.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Rails5 fix Projects::PagesController spec
merge_request: 20007
author: Jasper Maes
type: fixed

4
spec/controllers/projects/pages_controller_spec.rb
View File

@ -71,7 +71,7 @@ describe Projects::PagesController do
{
namespace_id: project.namespace,
project_id: project,
project: { pages_https_only: false }
project: { pages_https_only: 'false' }
}
end
@ -96,7 +96,7 @@ describe Projects::PagesController do
it 'calls the update service' do
expect(Projects::UpdateService)
.to receive(:new)
.with(project, user, request_params[:project])
.with(project, user, ActionController::Parameters.new(request_params[:project]).permit!)
.and_return(update_service)
patch :update, request_params