Merge lp:~martin-borho/ubuntu-weather-app/fixed_settings_test into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

fix for broken settings test

Fix for broken settings sheet test. Order of buttons was changed.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/14/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/6
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/6

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/14/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, good catch!

review: Approve

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-07-06 13:58:58 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-07-16 19:46:26 +0000
@@ -37,11 +37,11 @@
 
     def _click_confirm(self):
         """Clicks the confirm button"""
-        self.pointing_device.click_object(self.main_window.app.select_many('Button')[2])
+        self.pointing_device.click_object(self.main_window.app.select_many('Button')[1])
 
     def _click_cancel(self):
         """Clicks the cancel button"""
-        self.pointing_device.click_object(self.main_window.app.select_many('Button')[1])
+        self.pointing_device.click_object(self.main_window.app.select_many('Button')[0])
 
     def _check_units(self, units):
         """Checks selected units by values from the first location tab"""