Ubuntu Shorts App

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

  1. fixed-all-tests
  2. Merge into trunk
Proposed by Carla Sella
Status: Merged
Approved by: Roman Shchekin
Approved revision: 99
Merged at revision: 99
Proposed branch: lp:~carla-sella/ubuntu-rssreader-app/fixed-all-tests
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 44 lines (+12/-2)
2 files modified
rssreader-app.qml (+1/-1)
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+11/-1)
To merge this branch: bzr merge lp:~carla-sella/ubuntu-rssreader-app/fixed-all-tests
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+189705@code.launchpad.net

Commit message

Autopilot tests for ubuntu-rssreader-app.

Description of the change

Fixed all tests after upstream sdk version.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rssreader-app.qml'
2--- rssreader-app.qml 2013-10-07 12:49:31 +0000
3+++ rssreader-app.qml 2013-10-07 20:53:58 +0000
4@@ -125,9 +125,9 @@
5 }
6
7 ToolbarButton {
8+ objectName: "changemodebutton"
9 action: Action {
10 id: changeModeAction
11-
12 text: pageStack.isListView ? i18n.tr("Grid View") : i18n.tr("List view")
13 iconSource: pageStack.isListView ? Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg") : Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg")
14 onTriggered: {
15
16=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
17--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-10-06 13:07:13 +0000
18+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-10-07 20:53:58 +0000
19@@ -304,7 +304,7 @@
20 #open toolbar
21 toolbar = self.main_view.open_toolbar()
22
23- #click on list view toolbar button
24+ #click on refresh toolbar button
25 toolbar.click_button("rsspagerefreshbutton")
26
27 #wait for any updates to finish before continuing tests
28@@ -315,6 +315,16 @@
29 lambda:self.main_view.get_canonical_tab,
30 Eventually(NotEquals(None)))
31
32+ #open toolbar
33+ toolbar = self.main_view.open_toolbar()
34+
35+ #click on list view toolbar button
36+ toolbar.click_button("changemodebutton")
37+
38+ #verify we are on the CanonicalTopic Tab
39+ canonicalTab = self.main_view.get_canonical_tab()
40+ self.assertThat(lambda: canonicalTab.visible, Eventually(Equals(True)))
41+
42 #select Canonical feed
43 canonicalFeed = self.main_view.get_canonical_feed_in_feedlist()
44 self.assertThat(canonicalFeed, NotEquals(None))

Subscribers

People subscribed via source and target branches