Merge lp:~fazerlicourice/ubuntu-weather-app/autopilot-test-switch-locations into lp:ubuntu-weather-app

[Vamshi Balanaga]

added test to swipe between locations on home_page

Created a test that swipes between the location tabs on the homepage and checks that they change correctly.

[Andrew Hayzen (ahayzen)]

Not run autopilot yet, but the code looks good.

A few inline comments, related to moving parts of the code into the helper and getting the right label to test from.

Also remember to add a debian/changelog entry (via $ dch)

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

A few more diff comments, this is looking nice though. I haven't been able to run this on my desktop due to an old UITK version, I'll try on my device tomorrow.

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

This passes autopilot on my device \o/

adt-run [14:26:28]: test autopilot: - - - - - - - - - - results - - - - - - - - - -
autopilot PASS

There are a few minor comments I've added.

I will also add the team to review, which should add jenkins (IIRC jenkins is failing at the moment, so when we have fixed that in a separate branch you may have todo a pull).

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

Is this branch ready to be merged yet? Ie, has Jenkins been fixed?

[Nicholas Skaggs (nskaggs)]

Top --approving to land. Whew jenkins.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/weather-app-autolanding/411/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1564/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Text conflict in debian/changelog
1 conflicts encountered.

review: Needs Fixing

[lp:~fazerlicourice/ubuntu-weather-app/autopilot-test-switch-locations]

206. By Vamshi Balanaga <email address hidden> on 2016-02-06

* Use sidestage so that tablets don't go into portrait mode
[ Victor Thompson ]
* Change translatable string from "rain" to "precipitation" (LP:1521701)

fixed conflict

[Vamshi Balanaga (fazerlicourice)]

How do I restart the Jenkins build?

[Nicholas Skaggs (nskaggs)]

Vamshi, you aren't a member of an of the development teams, so you don't have any powers. Let me fix that :-) I added you to a team. You should be able to click the rebuild link (though jenkins will run on all new commits now).

[Nicholas Skaggs (nskaggs)]

You can also build any branch you wish at any time: https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/build?delay=0sec

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:205
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1021/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/573/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1021/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:206
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1023/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/575/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1023/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:206
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1024/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/576/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1024/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

How is this coming along? Do we feel this test is possible using qmltestrunner instead of autopilot?

[lp:~fazerlicourice/ubuntu-weather-app/autopilot-test-switch-locations]

207. By Vamshi Balanaga <email address hidden> on 2016-02-20

merged from upstream

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:207
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1043/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/595/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1043/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:207
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1044/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/596/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1044/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Running this on a device, the only test that fails is test_add_location_via_search which shouldn't be affected from this code, therefore I am approving this branch!

Sorry it has taken *so* long :-/

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'AUTHORS'
--- AUTHORS	2015-08-09 15:32:22 +0000
+++ AUTHORS	2016-02-20 12:23:17 +0000
@@ -3,8 +3,9 @@
 In addition, numerous translations, bug reports and other non-code contributions have been made which are equally valued.
 
 Andrew Hayzen <[e-mail]>
+Carla Sella <[e-mail]>
 Daniel Holbach <[e-mail]>
 Martin Borho <[e-mail]>
 Nekhelesh Ramananthan <[e-mail]>
+Vamshi Balanaga <[e-mail]>
 Victor Thompson <[e-mail]>
-Carla Sella <[e-mail]>

=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	2015-11-02 21:28:34 +0000
+++ app/components/HeaderRow.qml	2016-02-20 12:23:17 +0000
@@ -28,6 +28,7 @@
     width: parent.width
 
     Label {
+        objectName: 'headerLabel'
         id: locationNameLabel
         color: UbuntuColors.darkGrey
         elide: Text.ElideRight

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-29 23:07:11 +0000
+++ debian/changelog	2016-02-20 12:23:17 +0000
@@ -10,6 +10,9 @@
   [ Victor Thompson ]
   * Change translatable string from "rain" to "precipitation" (LP:1521701)
 
+  [ Vamshi Balanaga ]
+  * Added test to swipe between location tabs on home page (LP: #1452492)
+
  -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 15:20:49 +0000
 
 ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-11-03 00:38:48 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2016-02-20 12:23:17 +0000
@@ -27,7 +27,6 @@
 
     return func_wrapper
 
-
 #
 # Base helpers
 #
@@ -201,6 +200,19 @@
     def get_selected_location_pane(self):
         return self.get_location_pane(self.get_selected_location_index())
 
+    def swipe_left(self):
+
+        # Define the start and stop locations of the left swipe
+        start_x = (self.globalRect.x +
+                   (self.globalRect.width * 0.9))
+        stop_x = (self.globalRect.x +
+                  (self.globalRect.width * 0.1))
+        start_y = stop_y = (self.globalRect.y +
+                            (self.globalRect.height * 0.5))
+        rate = 5
+
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
+
 
 class HomeTempInfo(UbuntuUIToolkitCustomProxyObjectBase):
     pass
@@ -221,6 +233,10 @@
 
         return self.get_settings_button()
 
+    def get_name(self):
+        return self.wait_select_single(
+            "UCLabel", objectName='headerLabel').text
+
     def get_day_delegate(self, day):
         return self.wait_select_single(
             "DayDelegate", objectName="dayDelegate" + str(day))

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_home_page.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_home_page.py	2015-10-22 12:49:35 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_home_page.py	2016-02-20 12:23:17 +0000
@@ -83,3 +83,19 @@
         # Check that the state and height of the HomeTempInfo have changed
         self.assertThat(home_temp_info.state, Eventually(Equals("expanded")))
         self.assertEqual(home_temp_info.height, home_temp_info.expandedHeight)
+
+    def test_swiping_locations(self):
+        """tests swiping between the location tabs"""
+
+        # Check that starts at the first (index = 0) location tab
+        self.assertThat(self.home_page.get_selected_location_index(),
+                        Equals(0))
+
+        # Swipe to the left to switch Location tabs
+        self.home_page.swipe_left()
+
+        # Check that the selected location is now the intended location
+        self.assertThat(self.home_page.get_selected_location_index(),
+                        Eventually(Equals(1)))
+        self.assertThat(self.home_page.get_location_pane(1).get_name(),
+                        Equals('Washington'))