Merge pull request #18035 from kbrock/monitor_notifier_fix

Fix Notifications None (cherry picked from commit 8489078) https://bugzilla.redhat.com/show_bug.cgi?id=1535177
ManageIQ · Oct 1, 2018 · 33aa42d · 33aa42d
1 parent 28ab017
commit 33aa42d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/notification_type.rb b/app/models/notification_type.rb
@@ -11,7 +11,7 @@ class NotificationType < ApplicationRecord
   validates :level, :inclusion => { :in => %w(success error warning info) }
   validates :link_to, :inclusion => { :in => %w(subject initiator cause) }, :allow_blank => true
   validates :audience, :inclusion => {
-    :in => [AUDIENCE_USER, AUDIENCE_GROUP, AUDIENCE_TENANT, AUDIENCE_GLOBAL, AUDIENCE_SUPERADMIN]
+    :in => [AUDIENCE_USER, AUDIENCE_GROUP, AUDIENCE_TENANT, AUDIENCE_GLOBAL, AUDIENCE_SUPERADMIN, AUDIENCE_NONE]
   }
 
   def subscriber_ids(subject, initiator)

diff --git a/spec/models/notification_type_spec.rb b/spec/models/notification_type_spec.rb
@@ -44,4 +44,12 @@
       end
     end
   end
+
+  describe "#enabled?" do
+    it "detects properly" do
+      expect(FactoryGirl.build(:notification_type, :audience => NotificationType::AUDIENCE_USER)).to be_enabled
+      expect(FactoryGirl.build(:notification_type, :audience => NotificationType::AUDIENCE_NONE)).not_to be_enabled
+      expect(FactoryGirl.build(:notification_type, :audience => NotificationType::AUDIENCE_NONE)).to be_valid
+    end
+  end
 end