Merge lp:~elopio/ubuntu-rssreader-app/update_autopilot_tests into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Leo Arias]

Updated the autopilot tests.

[Joey Chan (qqworini)]

Will these changes trigger Jenkins Bot auto test ?

[Leo Arias (elopio)]

I'm not sure how is this configured for the rss reader. It's weird that the branch was allowed to diverge and have failing tests, so I suppose the bot is not running them.

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

review: Approve (continuous-integration)

=== modified file 'listview/ListModePage.qml'
--- listview/ListModePage.qml	2013-10-30 20:05:10 +0000
+++ listview/ListModePage.qml	2013-11-05 02:15:32 +0000
@@ -149,6 +149,7 @@
 
                     Label {
                         id: labelFeedname
+                        objectName: "labelFeedname"
 
                         text: model.feed_name
                         fontSize: "x-small"

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-10 16:52:39 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-05 02:15:32 +0000
@@ -176,11 +176,11 @@
 
     def get_feed_in_feedlist(self, topic, feed):
         tab = self.get_topic_tab(topic)
-        itemList = tab.select_many("Subtitled", objectName="feedlistitems")
+        itemList = tab.select_many("UbuntuShape", objectName="feedlistitems")
         for item in itemList:
-                splititem = item.subText.split(",")
-                if splititem[1] == " " + feed:
-                    return item
+            label = item.select_single("Label", objectName="labelFeedname")
+            if label.text == feed:
+               return item
 
     def get_editfeed_topic_valueselector(self):
         return self.select_single_retry(

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-10 18:12:28 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-05 02:15:32 +0000
@@ -360,9 +360,9 @@
 
         #click on news topic
         topicValueselectorValue = self.main_view. \
-                                  get_editfeed_valueselector_value("news")
+                                  get_editfeed_valueselector_value("Ubuntu")
         self.pointing_device.click_object(topicValueselectorValue)
 
         #verify topic has changed
         self.assertThat(topicValueselectorValue.text,
-                        Eventually(Equals("news")))
+                        Eventually(Equals("Ubuntu")))