From e2e0b175ae43bef44ba5fdc45b4a719aaae83422 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 22 Jun 2017 16:54:54 +0200 Subject: [PATCH] fix specs --- app/controllers/admin/users_controller.rb | 6 +++--- app/services/users/update_service.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 97ae68495c7..c44f381664f 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -156,11 +156,11 @@ class Admin::UsersController < Admin::ApplicationController respond_to do |format| if success - format.html { redirect_back_or_admin_user(notice: "Successfully removed email.") } + format.html { redirect_back_or_admin_user(notice: 'Successfully removed email.') } format.json { head :ok } else - format.html { redirect_back_or_admin_user(alert: result[:message]) } - format.json { render json: result[:message], status: result[:status] } + format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') } + format.json { render json: 'There was an error removing the e-mail.', status: 400 } end end end diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index 33f3686c8d5..36dcc69f8cf 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -10,7 +10,7 @@ module Users def execute(skip_authorization: false, validate: true, &block) assign_attributes(skip_authorization, &block) - if @user.save(validate: validate) || @user.errors.empty? + if @user.save(validate: validate) success else error(@user.errors.full_messages.uniq.join('. '))