diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-19 23:47:58 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-19 23:58:46 +0300 |
| commit | 74bb2e728b8daab4073d15370ecee32ed8458a02 (patch) | |
| tree | 7e6f36bb454ee49091871d4dee250a1a32bc9275 | |
| parent | e0da61bca80485b99f78ef1dbb3c64578d64d55a (diff) | |
Rails5 fix Projects::PagesController spec
| -rw-r--r-- | changelogs/unreleased/rails5-fix-pages-controller.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/pages_controller_spec.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/rails5-fix-pages-controller.yml b/changelogs/unreleased/rails5-fix-pages-controller.yml new file mode 100644 index 00000000000..eeb3747c4eb --- /dev/null +++ b/changelogs/unreleased/rails5-fix-pages-controller.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 fix Projects::PagesController spec +merge_request: 20007 +author: Jasper Maes +type: fixed diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb index 11f54eef531..8d2fa6a1740 100644 --- a/spec/controllers/projects/pages_controller_spec.rb +++ b/spec/controllers/projects/pages_controller_spec.rb @@ -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 |