Patch: do not degister pomodor if it hasn't finished.

rdok · Apr 19, 2019 · 07bfce9 · 07bfce9
1 parent d0f78ce
commit 07bfce9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/Command.lua b/src/Command.lua
@@ -8,7 +8,9 @@ Command = {
     onUpdate = function()
         Command.pomodoro = Pomodoro.ping(Command.pomodoro)
 
-        EVENT_MANAGER:UnregisterForUpdate(Pomodoro.updateId)
+        if (nil ~= Command.pomodoro.completedAt) then
+            EVENT_MANAGER:UnregisterForUpdate(Pomodoro.updateId)
+        end
     end,
 
     call = function(argument)

diff --git a/src/Pomodoro.lua b/src/Pomodoro.lua
@@ -1,8 +1,7 @@
 Pomodoro = {
     tenSecondsInMilliseconds = 10000,
-    updateId = 'Pomodoro.onUpdate', -- Seconds = 25 minutes
-    pomodoroDurationInSeconds = 25, -- 25 minutes
-    --pomodoroDurationInSeconds = 1500, -- 25 minutes
+    updateId = 'Pomodoro.onUpdate',
+    pomodoroDurationInSeconds = 1500, -- 25 minutes
     error_already_finished = "Error: Attempting to process finished Pomodoro.\nPlease report this at https://git.io/fjO3p",
 
     new = function()
@@ -55,8 +54,4 @@ Pomodoro = {
 
         return pomodoro
     end,
-
-    currentDuration = function()
-
-    end
 }
diff --git a/tests/Unit/Command_spec.lua b/tests/Unit/Command_spec.lua
@@ -72,6 +72,16 @@ describe("Command", function()
         assert.spy(EVENT_MANAGER.UnregisterForUpdate).was_called_with(EVENT_MANAGER, Pomodoro.updateId)
     end)
 
+    it("should not deregister if pomodoro hasn't complete", function()
+        spy.on(EVENT_MANAGER, "UnregisterForUpdate")
+        Command.call('start')
+        Command.pomodoro.completedAt = nil
+        Command.onUpdate()
+        assert.spy(EVENT_MANAGER.UnregisterForUpdate).was_not_called(
+
+        )
+    end)
+
     it("should deregister when pomodoro is stopped. #cmd_register", function()
         stub(_G, EVENT_MANAGER)
         Command.call('start')