Fix failing specs

Author: rsmithlal

app/models/better_together/navigation_item.rb

@@ -196,6 +196,24 @@ def to_s
       title
     end
 
+    def self.permitted_attributes(id: false, destroy: false) # rubocop:todo Metrics/MethodLength
+      # Base attributes used when creating/updating navigation items
+      attrs = %i[
+        url
+        icon
+        position
+        visible
+        item_type
+        parent_id
+        route_name
+        linkable_type
+        linkable_id
+        navigation_area_id
+      ]
+
+      super + attrs
+    end
+
     def url
       fallback_url = "##{identifier}"
 

app/policies/better_together/conversation_policy.rb

@@ -42,8 +42,10 @@ def permitted_participants
         role = BetterTogether::Role.find_by(identifier: 'platform_manager')
         manager_ids = BetterTogether::PersonPlatformMembership.where(role_id: role.id).pluck(:member_id)
         BetterTogether::Person.where(id: manager_ids)
-                              .or(BetterTogether::Person.where('preferences @> ?',
-                                                               { receive_messages_from_members: true }.to_json))
+                              .or(BetterTogether::Person.privacy_public.where('preferences @> ?',
+                                                                              # rubocop:todo Layout/LineLength
+                                                                              { receive_messages_from_members: true }.to_json))
+                              # rubocop:enable Layout/LineLength
                               .distinct
       end
     end

spec/features/conversations/create_spec.rb

@@ -3,13 +3,17 @@
 require 'rails_helper'
 
 RSpec.describe 'creating a new conversation', :as_platform_manager do
+  include BetterTogether::ConversationHelpers
+
   let!(:user) { create(:better_together_user, :confirmed) }
 
-  scenario 'between a platform manager and normal user' do
-    visit new_conversation_path(locale: I18n.default_locale)
-    select "#{user.person.name} - @#{user.person.identifier}", from: 'conversation[participant_ids][]'
-    fill_in 'conversation[title]', with: Faker::Lorem.sentence(word_count: 3)
-    click_button 'Create Conversation'
+  before do
+    # Ensure this person can be messaged by members so they appear in permitted_participants
+    user.person.update!(preferences: (user.person.preferences || {}).merge('receive_messages_from_members' => true))
+  end
+
+  scenario 'between a platform manager and normal user', :js do
+    create_conversation([user.person], first_message: Faker::Lorem.sentence(word_count: 8))
     expect(BetterTogether::Conversation.count).to eq(1)
   end
 
@@ -20,6 +24,21 @@
 
     let(:user2) { create(:better_together_user) }
 
+    # rubocop:todo RSpec/ExampleLength
+    scenario 'can create a conversation with a public person who opted into messages', :js do
+      target = create(:better_together_user, :confirmed)
+      # Ensure target is public and opted-in to receive messages from members
+      target.person.update!(privacy: 'public',
+                            # rubocop:todo Layout/LineLength
+                            preferences: (target.person.preferences || {}).merge('receive_messages_from_members' => true))
+      # rubocop:enable Layout/LineLength
+
+      expect do
+        create_conversation([target.person], first_message: 'Hi there')
+      end.to change(BetterTogether::Conversation, :count).by(1)
+    end
+    # rubocop:enable RSpec/ExampleLength
+
     it 'cannot create conversations with private users' do
       visit new_conversation_path(locale: I18n.default_locale)
       expect('conversation[participant_ids][]').not_to have_content(user2.person.name) # rubocop:todo RSpec/ExpectActual