From 4e74f114326c87a99d5cc5ea1bc9d8a33a298a95 Mon Sep 17 00:00:00 2001
From: Marcus Cavanaugh <m@mcav.com>
Date: Wed, 23 Apr 2014 16:34:02 -0700
Subject: [PATCH] Bug 1000496 - [B2G][Clock]Deleting an alarm then killing the
 clock app and relaunching it causes the deleted alarm to reappear.

---
 apps/clock/js/alarm.js                          | 2 +-
 apps/clock/test/marionette/alarm_test.js        | 8 ++++++++
 apps/clock/test/marionette/lib/alarm_actions.js | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/clock/js/alarm.js b/apps/clock/js/alarm.js
index e342bb4522de..ad1c8478d80c 100644
--- a/apps/clock/js/alarm.js
+++ b/apps/clock/js/alarm.js
@@ -293,7 +293,7 @@ define(function(require, exports, module) {
         window.dispatchEvent(new CustomEvent('alarm-removed', {
           detail: { alarm: this }
         }));
-        callback(err, this);
+        callback && callback(err, this);
       });
     },
 
diff --git a/apps/clock/test/marionette/alarm_test.js b/apps/clock/test/marionette/alarm_test.js
index 0553992092e6..37b8c3acaff2 100644
--- a/apps/clock/test/marionette/alarm_test.js
+++ b/apps/clock/test/marionette/alarm_test.js
@@ -21,6 +21,14 @@ marionette('Alarm', function() {
     assert.ok($('#clock-day-date').displayed());
   });
 
+  test('Deleting an alarm works between app launches', function() {
+    alarm.create();
+    alarm.openEditForm(0);
+    alarm.delete();
+    actions.restart();
+    assert.equal(alarm.list.length, 0);
+  });
+
   // PythonTests: functional/test_clock_set_alarm
   test('Blank "New Alarm" form mutates properly', function() {
     alarm.openNewForm();
diff --git a/apps/clock/test/marionette/lib/alarm_actions.js b/apps/clock/test/marionette/lib/alarm_actions.js
index 0385ac658b85..df8d07d203b7 100644
--- a/apps/clock/test/marionette/lib/alarm_actions.js
+++ b/apps/clock/test/marionette/lib/alarm_actions.js
@@ -63,6 +63,10 @@ AlarmActions.prototype = {
     this.actions.tapAndTransition('#alarm-close');
   },
 
+  delete: function() {
+    this.actions.tapAndTransition('#alarm-delete');
+  },
+
   saveForm: function() {
     this.actions.tapAndTransition('#alarm-done');
   },