Merge lp:~martin-borho/ubuntu-weather-app/missing_dependency into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Martin Borho on 2013-08-15
Status: Merged
Approved by: Nicholas Skaggs on 2013-08-15
Approved revision: 96
Merged at revision: 95
Proposed branch: lp:~martin-borho/ubuntu-weather-app/missing_dependency
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 33 lines (+3/-2)
2 files modified
debian/control (+1/-0)
tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py (+2/-2)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/missing_dependency
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) 2013-08-15 Approve on 2013-08-15
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-08-15
Review via email: mp+180368@code.launchpad.net

Commit message

added missing localstorage dependency

Description of the change

added missing localstorage dependency

To post a comment you must log in.
Nicholas Skaggs (nskaggs) :
review: Approve
96. By Martin Borho on 2013-08-15

fixed city search test

Nicholas Skaggs (nskaggs) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-08-06 19:16:50 +0000
3+++ debian/control 2013-08-15 18:33:12 +0000
4@@ -14,6 +14,7 @@
5 Depends: ${misc:Depends},
6 qmlscene,
7 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
8+ qtdeclarative5-localstorage-plugin,
9 qtdeclarative5-qtquick2-plugin
10 Description: Weather application
11 Core Weather application
12
13=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
14--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py 2013-08-14 21:31:36 +0000
15+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py 2013-08-15 18:33:12 +0000
16@@ -118,7 +118,7 @@
17 self.assertThat(resultsList.visible, Eventually(Equals(True)))
18 self.assertThat(lambda: self.main_window.get_object('Standard', 'searchResult0'), Eventually(Not(Is(None))))
19 firstResult = self.select_single_retry("Standard", objectName="searchResult0")
20- self.assertThat(firstResult.text, Eventually(Equals("London, United Kingdom")))
21+ self.assertThat(firstResult.text, Eventually(Equals("London, GB")))
22
23 # clear search field and do another search
24 self.assertThat(lambda: self.main_window.select_single('AbstractButton'), Eventually(Not(Is(None))))
25@@ -134,7 +134,7 @@
26 self.assertThat(resultsList.visible, Eventually(Equals(True)))
27 self.assertThat(lambda: self.main_window.get_object('Standard', 'searchResult0'), Eventually(Not(Is(None))))
28 firstResult = self.select_single_retry("Standard", objectName="searchResult0")
29- self.assertThat(firstResult.text, Eventually(Equals("Hamburg, Germany")))
30+ self.assertThat(firstResult.text, Eventually(Equals("Hamburg, DE")))
31
32 def test_cancel_adding_location(self):
33 """Cancel the cities search"""

Subscribers

People subscribed via source and target branches