Merge pull request #18613 from mcav/delete-alarm

Bug 1000496 - [B2G][Clock]Deleting an alarm then killing the clock app a... r=millermedeiros
mozilla-b2g · Apr 25, 2014 · acde8c6 · acde8c6
2 parents 0d07467 + 4e74f11
commit acde8c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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');
   },