Merge pull request #13428 from AndreiH/bug935433

Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions int...
mozilla-b2g · Nov 7, 2013 · 591d22e · 591d22e
2 parents 321707b + b38fb8d
commit 591d22e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 35 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/manifest.ini b/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/manifest.ini
@@ -2,8 +2,6 @@
 # Test requires B2G
 b2g = true
 
-[test_clock_all_items_present_new_alarm.py]
-
 [test_clock_create_new_alarm.py]
 
 [test_clock_delete_alarm.py]

diff --git a/...n/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_all_items_present_new_alarm.py b/...n/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_all_items_present_new_alarm.py
diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_create_new_alarm.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_create_new_alarm.py
@@ -28,6 +28,9 @@ def test_clock_create_new_alarm(self):
         # create a new alarm with the default values that are available
         new_alarm = self.clock.tap_new_alarm()
 
+        # Ensure label has the default placeholder and text
+        self.assertEquals(new_alarm.alarm_label_placeholder, 'Alarm name')
+
         # set label
         new_alarm.type_alarm_label(alarm_label_text)
         self.clock = new_alarm.tap_done()

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_repeat.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_repeat.py
@@ -22,6 +22,9 @@ def test_clock_set_alarm_repeat(self):
         """
         new_alarm = self.clock.tap_new_alarm()
 
+        # Ensure repeat has the default value
+        self.assertEquals(new_alarm.alarm_repeat, 'Never')
+
         # Set label
         new_alarm.type_alarm_label("TestSetAlarmRepeat")
 

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_snooze.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_snooze.py
@@ -22,6 +22,9 @@ def test_clock_set_alarm_snooze(self):
 
         new_alarm = self.clock.tap_new_alarm()
 
+        # Ensure snooze has the default value
+        self.assertEquals(new_alarm.alarm_snooze, '5 minutes')
+
         # Set label & snooze
         new_alarm.type_alarm_label("TestSetAlarmSnooze")
         new_alarm.select_snooze("15 minutes")

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_sound.py b/tests/python/gaia-ui-tests/gaiatest/tests/functional/clock/test_clock_set_alarm_sound.py
@@ -21,6 +21,9 @@ def test_clock_set_alarm_sound(self):
         """
         new_alarm = self.clock.tap_new_alarm()
 
+        # Ensure sound has the default value
+        self.assertEquals(new_alarm.alarm_sound, 'Classic Buzz')
+
         # set label &sound
         new_alarm.type_alarm_label("TestSetAlarmSound")
         new_alarm.select_sound('Gem Echoes')

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini b/tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
@@ -22,7 +22,6 @@ disabled = Bug 915138
 [functional/cards_view/test_cards_view_launch_app.py]
 [functional/cards_view/test_cards_view_with_three_apps.py]
 [functional/clock/test_clock_add_alarm_multiple_times.py]
-[functional/clock/test_clock_all_items_present_new_alarm.py]
 [functional/clock/test_clock_create_new_alarm.py]
 [functional/clock/test_clock_delete_alarm.py]
 [functional/clock/test_clock_set_alarm_repeat.py]