diff options
| author | Airat Shigapov <contact@airatshigapov.com> | 2016-09-04 16:33:14 +0300 |
|---|---|---|
| committer | Airat Shigapov <contact@airatshigapov.com> | 2016-09-05 14:13:15 +0300 |
| commit | b76ef40e36c70b18fc655a153c08c8814b6edf89 (patch) | |
| tree | e42b786fe61150d1f294b5bf7516b1f1d213e842 | |
| parent | beb0b666dc000d51b7ed0eb264bd04ca466117d1 (diff) | |
| download | gitlab-ce-b76ef40e36c70b18fc655a153c08c8814b6edf89.tar.gz | |
Fix missing flash messages on service edit page
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/projects/services_controller.rb | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/services_controller_spec.rb | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 93e91c457a3..29515e59c52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,7 @@ v 8.12.0 (unreleased) - Fix markdown help references (ClemMakesApps) - Add last commit time to repo view (ClemMakesApps) - Fix accessibility and visibility of project list dropdown button !6140 + - Fix missing flash messages on service edit page (airatshigapov) - Added project specific enable/disable setting for LFS !5997 - Don't expose a user's token in the `/api/v3/user` API (!6047) - Remove redundant js-timeago-pending from user activity log (ClemMakesApps) diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 6a227d85f6f..97e6e9471e0 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -20,9 +20,8 @@ class Projects::ServicesController < Projects::ApplicationController def update if @service.update_attributes(service_params[:service]) redirect_to( - edit_namespace_project_service_path(@project.namespace, @project, - @service.to_param, notice: - 'Successfully updated.') + edit_namespace_project_service_path(@project.namespace, @project, @service.to_param), + notice: 'Successfully updated.' ) else render 'edit' diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb index cccd492ef06..2e44b5128b4 100644 --- a/spec/controllers/projects/services_controller_spec.rb +++ b/spec/controllers/projects/services_controller_spec.rb @@ -49,4 +49,20 @@ describe Projects::ServicesController do let!(:referrer) { nil } end end + + describe 'PUT #update' do + context 'on successful update' do + it 'sets the flash' do + expect(service).to receive(:to_param).and_return('hipchat') + + put :update, + namespace_id: project.namespace.id, + project_id: project.id, + id: service.id, + service: { active: false } + + expect(flash[:notice]).to eq 'Successfully updated.' + end + end + end end |