DEV: Refactor hardcoded string into a constant.

discourse · Mar 21, 2019 · 903a09e · 903a09e
1 parent 78b2c5d
commit 903a09e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/app/jobs/concerns/alert_post_mixin.rb b/app/jobs/concerns/alert_post_mixin.rb
@@ -3,6 +3,7 @@ module AlertPostMixin
 
   FIRING_TAG = "firing".freeze
   HIGH_PRIORITY_TAG = "high-priority".freeze
+  NEXT_BUSINESS_DAY_SLA = "nbd".freeze
 
   private
 

diff --git a/app/jobs/regular/process_alert.rb b/app/jobs/regular/process_alert.rb
@@ -58,7 +58,7 @@ def assigned_topic(receiver, params)
           raw: raw,
           datacenters: datacenters(alert_history),
           firing: alert_history.any? { |alert| is_firing?(alert["status"]) },
-          high_priority: params["commonLabels"]["response_sla"] != next_business_day_sla
+          high_priority: params["commonLabels"]["response_sla"] != AlertPostMixin::NEXT_BUSINESS_DAY_SLA
         )
 
         assign_alert(topic, receiver) unless topic.assigned_to_user
@@ -98,7 +98,7 @@ def create_new_topic(receiver, params, alert_history)
 
       tags << AlertPostMixin::FIRING_TAG.dup if is_firing?(params['status'])
 
-      if params["commonLabels"]["response_sla"] != next_business_day_sla
+      if params["commonLabels"]["response_sla"] != AlertPostMixin::NEXT_BUSINESS_DAY_SLA
         tags << AlertPostMixin::HIGH_PRIORITY_TAG.dup
       end
 
@@ -156,10 +156,6 @@ def random_group_member(id_or_name)
       Group.find_by(attributes).users.sample
     end
 
-    def next_business_day_sla
-      "nbd"
-    end
-
     def assign_alert(topic, receiver, assignee: nil)
       return unless SiteSetting.prometheus_alert_receiver_enable_assign
 

diff --git a/spec/integration/discourse_prometheus_alert_receiver/receiver_controller_spec.rb b/spec/integration/discourse_prometheus_alert_receiver/receiver_controller_spec.rb
@@ -99,7 +99,7 @@
     end
 
     before do
-      SiteSetting.queue_jobs = false
+      Jobs.run_immediately!
       SiteSetting.tagging_enabled = true
     end