From de8a1120eb2cabb6be5b2250ee85fdfcede0d942 Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Fri, 4 Apr 2025 12:18:03 +0200 Subject: [PATCH] Move constant to new concern to group labels together --- app/models/account/pop_reasons.rb | 4 +++- app/models/pop.rb | 2 +- app/models/pop/reason.rb | 2 -- test/models/account/pop_reasons_test.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/account/pop_reasons.rb b/app/models/account/pop_reasons.rb index 6c190a4f2..63ce1584e 100644 --- a/app/models/account/pop_reasons.rb +++ b/app/models/account/pop_reasons.rb @@ -8,10 +8,12 @@ module Account::PopReasons "Working as intended" ] + FALLBACK_LABEL = "Done" + included do has_many :pop_reasons, dependent: :destroy, class_name: "Pop::Reason" do def labels - pluck(:label).presence || [ Pop::Reason::FALLBACK_LABEL ] + pluck(:label).presence || [ FALLBACK_LABEL ] end end diff --git a/app/models/pop.rb b/app/models/pop.rb index 619b8d1c2..08c7dbcff 100644 --- a/app/models/pop.rb +++ b/app/models/pop.rb @@ -3,6 +3,6 @@ class Pop < ApplicationRecord belongs_to :user, optional: true def reason - super || Pop::Reason::FALLBACK_LABEL + super || Account::PopReasons::FALLBACK_LABEL end end diff --git a/app/models/pop/reason.rb b/app/models/pop/reason.rb index 14cafa266..753862a95 100644 --- a/app/models/pop/reason.rb +++ b/app/models/pop/reason.rb @@ -1,5 +1,3 @@ class Pop::Reason < ApplicationRecord belongs_to :account - - FALLBACK_LABEL = "Done" end diff --git a/test/models/account/pop_reasons_test.rb b/test/models/account/pop_reasons_test.rb index 1004eda69..d72c562b7 100644 --- a/test/models/account/pop_reasons_test.rb +++ b/test/models/account/pop_reasons_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class PopReasonsTest < ActiveSupport::TestCase test "create defaults pop reasons on creation" do