Skip to content

Commit 31bcafb

Browse files
committed
removes unused function. remove unecessary function
1 parent d82aa18 commit 31bcafb

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

app/models/feature.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ def disabled?(feature)
4444
!enabled?(feature)
4545
end
4646

47-
def require_any_enabled!(features, message: nil)
48-
if features.none? { |feature| enabled?(feature) }
49-
message ||= "At least one of the following features must be enabled: #{features.join(', ')}"
50-
abort "ERROR: #{message}"
51-
end
52-
end
53-
5447
def method_missing(method_name, *arguments, &block)
5548
if method_name.to_s.end_with?("?")
5649
enabled?(method_name.to_s.chomp("?"))

app/models/setting.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,5 @@ def require_keys!(*keys)
2323
end
2424
end
2525
end
26-
27-
def require_value_in!(key, values)
28-
if values.exclude?(send(key))
29-
abort "ERROR: The value of #{key.upcase} must be one of: #{values.join(", ")}"
30-
end
31-
end
3226
end
3327
end

config/initializers/email_feature.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ def all
1212
if Feature.email?
1313
Rails.application.configure do
1414
Setting.require_keys!(:email_provider, :email_from, :email_host)
15-
Setting.require_value_in!(:email_provider, EmailProviders.all)
15+
16+
if EmailProviders.all.exclude?(Setting.email_provider)
17+
abort "ERROR: The value of EMAIL_PROVIDER must be one of: #{EmailProviders.all.join(", ")}"
18+
end
1619

1720
config.action_mailer.default_url_options = { host: Setting.email_host }
1821

test/jobs/send_reset_password_email_job_test.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ class SendResetPasswordEmailJobTest < ActiveJob::TestCase
99
@os = "Windows"
1010
@browser = "Chrome"
1111

12-
@settings = {
13-
email_from: "[email protected]",
14-
product_name: "Product Name"
15-
}
16-
@features = {
12+
stub_features(
1713
password_reset_email: true,
1814
email_postmark: true
19-
}
15+
)
16+
stub_settings(
17+
email_from: "[email protected]",
18+
product_name: "Product Name"
19+
)
2020
end
2121

2222
test "calls deliver_later if person with password is found for email" do

0 commit comments

Comments
 (0)