diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-20 09:59:30 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-20 09:59:30 +0000 |
commit | 52b9cead80a51fcf6d293f2b3cd29f23e5e71a2d (patch) | |
tree | 3d3fb158f867317cf4f309f568878a72ab84e058 | |
parent | ed2fde007132533008b669be764cbc231a456a44 (diff) | |
parent | 74bb2e728b8daab4073d15370ecee32ed8458a02 (diff) | |
download | gitlab-ce-52b9cead80a51fcf6d293f2b3cd29f23e5e71a2d.tar.gz |
Merge branch 'rails5-fix-pages-controller' into 'master'
Rails5 fix Projects::PagesController spec
See merge request gitlab-org/gitlab-ce!20007
-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 |