show configured state of preference even if no tokens present #8

Author: jkraemer

lib/redmine_expo_push/notification.rb

@@ -33,10 +33,12 @@ def deliver
       end
       messages.flatten!
 
-      begin
-        Exponent::Push::Client.new(gzip: true).publish messages
-      rescue Exception
-        Rails.logger.error "error sending push notifications:\n#{$!}\n" + $!.backtrace.join("\n")
+      if messages.any?
+        begin
+          Exponent::Push::Client.new(gzip: true).publish messages
+        rescue Exception
+          Rails.logger.error "error sending push notifications:\n#{$!}\n" + $!.backtrace.join("\n")
+        end
       end
     end
   end

lib/redmine_expo_push/patches/user_patch.rb

@@ -21,7 +21,8 @@ def send_push_notifications?
       end
 
       def push_skip_emails?
-        pref.push_notifications == "enabled_no_email"
+        # only skip emails when at least one device is registered
+        pref.push_notifications == "enabled_no_email" and push_device_registered?
       end
 
       def remove_references_before_destroy

lib/redmine_expo_push/patches/user_preference_patch.rb

@@ -13,11 +13,7 @@ def self.apply
       end
 
       def push_notifications
-        if user.push_device_registered?
-          self[:push_notifications] || "enabled_no_email"
-        else
-          "disabled"
-        end
+        self[:push_notifications] || "enabled_no_email"
       end
 
       def push_notifications=(new_value)

test/units/notification_test.rb

@@ -17,16 +17,22 @@ class NotificationTest < ActiveSupport::TestCase
     assert_match(/released/, n.body)
   end
 
-  test "should send notification instead of email" do
+  test "should send notification instead of email when token present" do
     Exponent::Push::Client.any_instance.expects(:publish)
 
-    # no token, email is sent
+    assert_equal 'enabled_no_email', @user.pref.push_notifications
+    assert @user.send_push_notifications?
+    refute @user.push_skip_emails?
+
+    # no token, email is still sent
     mail = Mailer.news_added @user, @news
     mail.deliver
     assert_equal 1, @emails.size
 
     @emails.clear
     @user.expo_push_tokens.create! token: "foo"
+    assert @user.send_push_notifications?
+    assert @user.push_skip_emails?
 
     # token is set, push notification but no email is sent
     mail = Mailer.news_added @user, @news

test/units/user_test.rb

@@ -7,8 +7,8 @@ class UserTest < ActiveSupport::TestCase
     @user = User.find_by_login "jsmith"
   end
 
-  test "should default to no push notifs" do
-    refute @user.send_push_notifications?
+  test "should not skip emails when no tokens present" do
+    assert @user.send_push_notifications?
     refute @user.push_skip_emails?
   end