From 340a3ee5cbca879400f96e42e0a023b5dc2729ac Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 3 Jul 2017 16:03:26 -0400 Subject: [PATCH] correct spec to handle not null visibility_level --- app/controllers/admin/groups_controller.rb | 6 +++++- spec/controllers/admin/groups_controller_spec.rb | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 3613ffc04e2..90045704ff0 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -59,7 +59,11 @@ class Admin::GroupsController < Admin::AdminController def save_group(group) group.alias_level = group_params[:alias_level].to_i if group_params[:alias_level].present? - group.visibility_level = group_params[:visibility_level] + + if group_params[:visibility_level] + group.visibility_level = group_params[:visibility_level] + end + grant_trust_level = group_params[:grant_trust_level].to_i group.grant_trust_level = (grant_trust_level > 0 && grant_trust_level <= 4) ? grant_trust_level : nil diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index 7f3be4a91e1..27c95cb78f7 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -115,10 +115,7 @@ describe Admin::GroupsController do end it "ignore name change on automatic group" do - expect do - xhr :put, :update, { id: 1, group: { name: "WAT" } } - end.to change { GroupHistory.count }.by(1) - + xhr :put, :update, { id: 1, group: { name: "WAT" } } expect(response).to be_success group = Group.find(1)