Merge lp:~vthompson/ubuntu-weather-app/fix-1452498 into lp:ubuntu-weather-app

[Victor Thompson]

* Create autopilot test which cancels adding a location
* Make the tests grab the top of the minimized bottom edge hint to avoid resizing the app

* Create autopilot test which cancels adding a location
* Make the tests grab the top of the minimized bottom edge hint to avoid resizing the app

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

PASSED: Continuous integration, rev:85
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/179/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/179

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looking good so far, 1 inline comment

review: Needs Fixing

[lp:~vthompson/ubuntu-weather-app/fix-1452498]

86. By Victor Thompson on 2015-08-10

Merge of reboot and resolve conflicts

87. By Victor Thompson on 2015-08-10

Create click_back() method

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

PASSED: Continuous integration, rev:87
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/194/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/164
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/194

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline comment from a bad merge conflict resolution, otherwise looking good.

review: Needs Fixing

[lp:~vthompson/ubuntu-weather-app/fix-1452498]

88. By Victor Thompson on 2015-08-12

Fix conflict resolution

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

PASSED: Continuous integration, rev:88
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/204/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/174
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/204

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-09 16:51:36 +0000
+++ debian/changelog	2015-08-12 00:11:49 +0000
@@ -14,6 +14,9 @@
   * Create autopilot test which removes a single location (LP: #1452499)
   * Remove C++ flag from CMakeLists.txt
   * Show README files in QtCreator
+  * Create autopilot test which cancels adding a location (LP: #1452498)
+  * Make the tests grab the top of the minimized tooltip to avoid resizing the
+    app
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-09 16:51:36 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-12 00:11:49 +0000
@@ -78,8 +78,7 @@
             action_item.visible.wait_for(True)
             start_x = (action_item.globalRect.x +
                        (action_item.globalRect.width * 0.5))
-            start_y = (action_item.globalRect.y +
-                       (action_item.height * 0.5))
+            start_y = action_item.globalRect.y
             stop_y = start_y - (self.height * 0.7)
             self.pointing_device.drag(start_x, start_y,
                                       start_x, stop_y, rate=2)
@@ -94,6 +93,9 @@
     def __init__(self, *args, **kwargs):
         super(AddLocationPage, self).__init__(*args, **kwargs)
 
+    def click_back(self):
+        self.main_view.get_header().click_custom_back_button()
+
     @click_object
     def click_location(self, index):
         return self.select_single("UCListItem",

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py	2015-07-29 22:14:02 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_add_location_page.py	2015-08-12 00:11:49 +0000
@@ -98,3 +98,19 @@
         # Check that the location was added
         self.assertThat(self.home_page.get_location_count,
                         Eventually(Equals(self.start_count + 1)))
+
+    def test_cancel_add_location(self):
+        """ tests tapping the back button in the add location page """
+
+        # Go back to the locations page
+        self.add_location_page.click_back()
+
+        # Go back to the homepage
+        self.locations_page.click_back()
+
+        # Check homepage is now visible
+        self.assertThat(self.home_page.visible, Eventually(Equals(True)))
+
+        # Check that the location count did not change
+        self.assertThat(self.home_page.get_location_count,
+                        Eventually(Equals(self.start_count)))