From b98cf565d1cd9065a354a5d03bb8b14181599f80 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 18 Aug 2020 18:30:08 +0200 Subject: [PATCH] FIX: makes group_show_serializer#is_group_owner follow standards (#10466) It should only return if is_group_owner, otherwise the field won't be present in json. --- app/serializers/group_show_serializer.rb | 4 ++-- spec/serializers/group_show_serializer_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb index be3ec4646dc..17e11ac7d2f 100644 --- a/app/serializers/group_show_serializer.rb +++ b/app/serializers/group_show_serializer.rb @@ -12,11 +12,11 @@ class GroupShowSerializer < BasicGroupSerializer end def include_is_group_owner? - authenticated? + authenticated? && fetch_group_user&.owner end def is_group_owner - fetch_group_user&.owner + true end def include_is_group_owner_display? diff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb index b781b3121d6..6d1c0bcfab8 100644 --- a/spec/serializers/group_show_serializer_spec.rb +++ b/spec/serializers/group_show_serializer_spec.rb @@ -13,7 +13,7 @@ describe GroupShowSerializer do it 'should return the right attributes' do json = GroupShowSerializer.new(group, scope: Guardian.new(user)).as_json - expect(json[:group_show][:is_group_owner]).to eq(false) + expect(json[:group_show][:is_group_owner]).to eq(nil) expect(json[:group_show][:is_group_user]).to eq(true) end end