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

[Victor Thompson]

* Create autopilot test which removes a single location

* Create autopilot test which removes a single location

[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/180/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/150
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/180

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

review: Approve (continuous-integration)

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

86. By Victor Thompson on 2015-08-08

Add missing file

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline comment for now..

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

..As in the music-app's tests

http://bazaar.launchpad.net/~music-app-dev/music-app/refactor/view/head:/tests/autopilot/music_app/__init__.py#L412

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

87. By Victor Thompson on 2015-08-09

Move remove code to list item class

[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/185/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/155
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/185

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for the extra change :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-07 01:22:44 +0000
+++ debian/changelog	2015-08-09 01:44:44 +0000
@@ -11,6 +11,7 @@
   * Fix the CMakeLists.txt to include the app icon
   * Rename EmptyStateComponent to HomePageEmptyStateComponent
   * Add a LocationsPageEmptyStateComponent
+  * Create autopilot test which removes a single location (LP: #1452499)
 
   [ 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-06 00:10:53 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2015-08-09 01:44:44 +0000
@@ -152,3 +152,17 @@
 class WeatherListItem(UbuntuUIToolkitCustomProxyObjectBase):
     def get_name(self):
         return self.select_single("Label", objectName="name").text
+
+    @click_object
+    def select_remove(self):
+        return self.select_single(objectName="swipeDeleteAction")
+
+    def swipe_and_select_remove(self):
+        x, y, width, height = self.globalRect
+        start_x = x + (width * 0.2)
+        stop_x = x + (width * 0.8)
+        start_y = stop_y = y + (height // 2)
+
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+        self.select_remove()

=== added file 'tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py	2015-08-09 01:44:44 +0000
@@ -0,0 +1,67 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013, 2014, 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Ubuntu Weather app autopilot tests."""
+
+from __future__ import absolute_import
+
+import logging
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from testtools.matchers import NotEquals
+
+
+from ubuntu_weather_app.tests import UbuntuWeatherAppTestCaseWithData
+
+logger = logging.getLogger(__name__)
+
+
+class TestLocationsPage(UbuntuWeatherAppTestCaseWithData):
+
+    """ Tests for the locations page
+        setUp jumps to locations page as all tests start from here """
+
+    def setUp(self):
+        super(TestLocationsPage, self).setUp()
+
+        # Get the start count of the homepage
+        self.home_page = self.app.get_home_page()
+        self.start_count = self.home_page.get_location_count()
+
+        # Open the locations page from bottom edge
+        self.home_page.reveal_bottom_edge_page()
+
+        self.locations_page = self.app.get_locations_page()
+        self.locations_page.visible.wait_for(True)
+
+    def test_removing_location_via_list_item_action(self):
+        """ tests removing a location via the list item action """
+
+        # Get the list item of the first location
+        list_item = self.locations_page.get_location(0)
+
+        # Check that the first location is London
+        self.assertThat(list_item.get_name(), Equals("London"))
+
+        # Remove the location via the list item action
+        list_item.swipe_and_select_remove()
+
+        # Check that the location was removed
+        self.assertThat(self.home_page.get_location_count,
+                        Eventually(Equals(self.start_count - 1)))
+
+        # Get the list item of the first location
+        list_item = self.locations_page.get_location(0)
+
+        # Check that the first location is not London
+        self.assertThat(list_item.get_name(), NotEquals("London"))
+
+        # Go back to the homepage
+        self.locations_page.click_back()
+
+        # Check homepage is now visible
+        self.assertThat(self.home_page.visible, Eventually(Equals(True)))