From adcf6acecac1c669f333f6f10ff0aafbcc93f0d2 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 7 Nov 2025 11:34:34 +0100 Subject: [PATCH] Fix tests and remove unused policy files --- app/policies/family_invitation_policy.rb | 22 ------------------ app/policies/family_membership_policy.rb | 23 ------------------- spec/requests/users/registrations_spec.rb | 6 ++--- .../families/accept_invitation_spec.rb | 1 + spec/services/families/invite_spec.rb | 1 + 5 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 app/policies/family_invitation_policy.rb delete mode 100644 app/policies/family_membership_policy.rb diff --git a/app/policies/family_invitation_policy.rb b/app/policies/family_invitation_policy.rb deleted file mode 100644 index 2369458b..00000000 --- a/app/policies/family_invitation_policy.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class FamilyInvitationPolicy < ApplicationPolicy - def show? - # Public endpoint for invitation acceptance - no authentication required - true - end - - def create? - user.family == record.family && user.family_owner? - end - - def accept? - # Users can accept invitations sent to their email - user.email == record.email - end - - def destroy? - # Only family owners can cancel invitations - user.family == record.family && user.family_owner? - end -end diff --git a/app/policies/family_membership_policy.rb b/app/policies/family_membership_policy.rb deleted file mode 100644 index 1b50c18e..00000000 --- a/app/policies/family_membership_policy.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -class FamilyMembershipPolicy < ApplicationPolicy - def show? - user.family == record.family - end - - def update? - # Users can update their own settings - return true if user == record.user - - # Family owners can update any member's settings - user.family == record.family && user.family_owner? - end - - def destroy? - # Users can remove themselves (handled by family leave logic) - return true if user == record.user - - # Family owners can remove other members - user.family == record.family && user.family_owner? - end -end diff --git a/spec/requests/users/registrations_spec.rb b/spec/requests/users/registrations_spec.rb index 6a5989ea..726c2ac3 100644 --- a/spec/requests/users/registrations_spec.rb +++ b/spec/requests/users/registrations_spec.rb @@ -51,8 +51,8 @@ RSpec.describe 'Users::Registrations', type: :request do get new_user_registration_path expect(response).to have_http_status(:ok) - expect(response.body).to include('Register now!') - expect(response.body).to include('take control over your location data') + expect(response.body).to include('Almost there!') + expect(response.body).to include('control over your location data') expect(response.body).not_to include('Join') expect(response.body).to include('Sign up') end @@ -227,7 +227,7 @@ RSpec.describe 'Users::Registrations', type: :request do get new_user_registration_path expect(response).to have_http_status(:ok) - expect(response.body).to include('Register now!') + expect(response.body).to include('Almost there!') end it 'allows account creation' do diff --git a/spec/services/families/accept_invitation_spec.rb b/spec/services/families/accept_invitation_spec.rb index 28dca538..cd515284 100644 --- a/spec/services/families/accept_invitation_spec.rb +++ b/spec/services/families/accept_invitation_spec.rb @@ -99,6 +99,7 @@ RSpec.describe Families::AcceptInvitation do context 'when family is at max capacity' do before do + allow(DawarichSettings).to receive(:self_hosted?).and_return(false) # Fill family to max capacity create_list(:family_membership, Family::MAX_MEMBERS, family: family, role: :member) end diff --git a/spec/services/families/invite_spec.rb b/spec/services/families/invite_spec.rb index 8ea3c747..087d3331 100644 --- a/spec/services/families/invite_spec.rb +++ b/spec/services/families/invite_spec.rb @@ -57,6 +57,7 @@ RSpec.describe Families::Invite do context 'when family is at max capacity' do before do + allow(DawarichSettings).to receive(:self_hosted?).and_return(false) # Create max members (5 total including owner) create_list(:family_membership, Family::MAX_MEMBERS - 1, family: family, role: :member) end