Merge lp:~carla-sella/ubuntu-rssreader-app/edit-topic-test into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Autopilot edit topic test for ubuntu-rssreader-app.

Completed edit topic test.

[Nicholas Skaggs (nskaggs)]

This works through multiple iterations just fine, fixes the current regressions due to UI changes, and adds a testcase :-)

review: Approve

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

FAILED: Continuous integration, rev:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/89/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/860
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/89

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/90/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/861
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/90

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/91/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/862
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/91
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/91
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/91
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/91

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:107
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/92/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/864
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/92

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml	2013-10-07 13:42:07 +0000
+++ feeds/EditFeed.qml	2013-10-09 20:05:58 +0000
@@ -49,6 +49,7 @@
         Button
         {
             id: btnApply
+            objectName: "doneButton"
             text: i18n.tr("Done")
             gradient: UbuntuColors.orangeGradient
             anchors.verticalCenter: parent.verticalCenter
@@ -165,6 +166,7 @@
             }
 
             ListItem.ValueSelector {
+                objectName: "valueselector"
                 id: seletorTopic
                 text: i18n.tr("Topic: ")
                 values: (topicArray == undefined || topicArray.length == 0) ? [""] : topicArray

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-06 13:07:13 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-09 20:05:58 +0000
@@ -156,6 +156,9 @@
     def get_toolbar_back_button(self):
         return self.select_single("ActionItem", text="Back")
 
+    def get_editfeed_done_button(self):
+        return self.select_single_retry("Button", objectName="doneButton")
+
     def get_activityIndicator(self):
         return self.select_single_retry(
             "ActivityIndicator", objectName="activityindicator")
@@ -173,9 +176,11 @@
                 if splititem[1] == " Canonical":
                     return item
 
-    def get_page_back_btn(self):
-        back_btn = self.select_single(
-            "ToolbarItems", objectName="pageBackBtn")
-        back_btn_ActionItem = back_btn.select_single(
-            "ActionItem", text="Back")
-        return back_btn_ActionItem
+    def get_editfeed_topic_valueselector(self):
+        return self.select_single_retry(
+            "ValueSelector", objectName="valueselector")
+
+    def get_editfeed_valueselector_value(self, name):
+        valueselector = self.get_editfeed_topic_valueselector()
+        return valueselector.select_single("LabelVisual", text=name)
+

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-07 20:50:09 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-09 20:05:58 +0000
@@ -126,9 +126,6 @@
         logger.debug("grabbing feed")
         feed = self.main_view.get_feedlist_feed(feedName)
 
-
-
-
         self.assertThat(
             self.main_view.get_feed_management_page,
                 Eventually(NotEquals(None)))
@@ -143,14 +140,6 @@
         #self.pointing_device.click()
         self.pointing_device.drag(startX, lineY, stopX, lineY)
 
-
-
-
-
-
-
-
-
         #logger.debug("clicking feed")
         #self.pointing_device.click_object(feed)
 
@@ -338,7 +327,7 @@
         toolbar = self.main_view.open_toolbar()
 
         #click on back toolbar button
-        rssfeedpageBackBtn = self.main_view.get_page_back_btn()
+        rssfeedpageBackBtn = self.main_view.get_toolbar_back_button()
         self.pointing_device.click_object(rssfeedpageBackBtn)
 
         #verify we are on the CanonicalTopic Tab
@@ -350,3 +339,106 @@
 
         #remove added Canonical topic
         self._remove_topic(topicName)
+
+    def test_edit_topic(self):
+        """test edit topic"""
+
+        feed = "http://www.canonical.com/rss.xml"
+        feedName = "Canonical"
+        topicName = "CanonicalTopic"
+
+        #add topic and feed
+        self._add_feed_and_topic(feed, topicName)
+
+        #verify we are on the CanonicalTopic Tab
+        canonicalTab = self.main_view.get_canonical_tab()
+        self.assertThat(canonicalTab.visible, Eventually(Equals(True)))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on edit topics button
+        toolbar.click_button("edittopicsbutton")
+
+        # verify we are on topic management page
+        topicmanagementpage = self.main_view.get_feed_management_page()
+        self.assertThat(
+            topicmanagementpage.objectName,
+            Eventually(Equals("topicmanagement")))
+
+        #verity Canonical Tab is expanded
+        canonicaltopic = self.main_view.get_feedlist_topic(topicName)
+        if canonicaltopic.state != "expended":
+            self.pointing_device.click_object(canonicaltopic)
+
+        #select Canonical feed
+        canonicalFeed = self.main_view.get_feedlist_feed(feedName)
+        self.assertThat(canonicalFeed, NotEquals(None))
+        self.pointing_device.click_object(canonicalFeed)
+
+        #verify we are on edit feed page
+        editfeedpage = self.main_view.get_edit_feed_page()
+        self.assertThat(editfeedpage.visible, Eventually(Equals(True)))
+
+        #change topic from dropdown
+        topicValueselector = self.main_view.get_editfeed_topic_valueselector()
+        self.pointing_device.click_object(topicValueselector)
+
+        #click on news topic
+        topicValueselectorValue=self.main_view.get_editfeed_valueselector_value("news")
+        self.pointing_device.click_object(topicValueselectorValue)
+
+        #verify topic has changed
+        self.assertThat(topicValueselectorValue.text, Eventually(Equals("news")))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on done button
+        editfeedpageDoneButton = self.main_view.get_editfeed_done_button()
+        self.pointing_device.click_object(editfeedpageDoneButton)
+
+        ##select Canonical feed again
+        canonicalFeed = self.main_view.get_feedlist_feed(feedName)
+        self.assertFalse(not canonicalFeed)
+        self.pointing_device.click_object(canonicalFeed)
+
+        #verify we are on edit feed page
+        editfeedpage = self.main_view.get_edit_feed_page()
+        self.assertFalse(not editfeedpage)
+
+        #change topic from dropdown
+        topicValueselector = self.main_view.get_editfeed_topic_valueselector()
+        self.pointing_device.click_object(topicValueselector)
+
+        #click on news topic
+        topicValueselectorValue=self.main_view.get_editfeed_valueselector_value("CanonicalTopic")
+        self.pointing_device.click_object(topicValueselectorValue)
+
+        #verify topic has changed
+        self.assertThat(topicValueselectorValue.text, Eventually(Equals(("CanonicalTopic"))))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on done button
+        editfeedpageDoneButton = self.main_view.get_editfeed_done_button()
+        self.pointing_device.click_object(editfeedpageDoneButton)
+
+        #verify we are on the CanonicalTopic Tab
+        canonicalTab = self.main_view.get_canonical_tab()
+        self.assertFalse(not canonicalTab)
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on back toolbar Button
+        backButton = self.main_view.get_toolbar_back_button()
+        self.pointing_device.click_object(backButton)
+
+        #remove added Canonical feed
+        self._remove_feed(feedName, topicName)
+
+        #remove added Canonical topic
+        self._remove_topic(topicName)
+