Merge lp:~carla-sella/ubuntu-rssreader-app/fixed-all-tests into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Autopilot tests for ubuntu-rssreader-app.

Fixed all tests after upstream sdk version.

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

PASSED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/87/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/801
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/87

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

review: Approve (continuous-integration)

=== modified file 'rssreader-app.qml'
--- rssreader-app.qml	2013-10-07 12:49:31 +0000
+++ rssreader-app.qml	2013-10-07 20:53:58 +0000
@@ -125,9 +125,9 @@
             }
 
             ToolbarButton {
+                objectName: "changemodebutton"
                 action: Action {
                     id: changeModeAction
-
                     text:  pageStack.isListView ? i18n.tr("Grid View") : i18n.tr("List view")
                     iconSource: pageStack.isListView ? Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg") : Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg")
                     onTriggered: {
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-06 13:07:13 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-07 20:53:58 +0000
@@ -304,7 +304,7 @@
         #open toolbar
         toolbar = self.main_view.open_toolbar()
 
-        #click on list view toolbar button
+        #click on refresh  toolbar button
         toolbar.click_button("rsspagerefreshbutton")
 
         #wait for any updates to finish before continuing tests
@@ -315,6 +315,16 @@
                 lambda:self.main_view.get_canonical_tab,
                 Eventually(NotEquals(None)))
 
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on list view toolbar button
+        toolbar.click_button("changemodebutton")
+
+        #verify we are on the CanonicalTopic Tab
+        canonicalTab = self.main_view.get_canonical_tab()
+        self.assertThat(lambda: canonicalTab.visible, Eventually(Equals(True)))
+
         #select Canonical feed
         canonicalFeed = self.main_view.get_canonical_feed_in_feedlist()
         self.assertThat(canonicalFeed, NotEquals(None))