Merge lp:~aacid/unity8/make_test_page_header_more_stable into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 1857
Merged at revision: 1876
Proposed branch: lp:~aacid/unity8/make_test_page_header_more_stable
Merge into: lp:unity8
Diff against target: 67 lines (+12/-6)
1 file modified
tests/qmltests/Dash/tst_PageHeader.qml (+12/-6)
To merge this branch: bzr merge lp:~aacid/unity8/make_test_page_header_more_stable
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Cimitan (community) Approve
Review via email: mp+264679@code.launchpad.net

Commit message

make testPageHeader more stable

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Test change only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

waiting CI....

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
qmltests did
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
2--- tests/qmltests/Dash/tst_PageHeader.qml 2015-01-09 09:15:45 +0000
3+++ tests/qmltests/Dash/tst_PageHeader.qml 2015-07-14 08:35:37 +0000
4@@ -34,6 +34,12 @@
5 property alias searchEnabled : pageHeader.searchEntryEnabled
6 property alias searchQuery : pageHeader.searchQuery
7
8+ function doTypeString(text) {
9+ var headerContainer = findChild(pageHeader, "headerContainer");
10+ tryCompare(headerContainer, "contentY", 0);
11+ typeString(text);
12+ }
13+
14 function init() {
15 searchEnabled = true;
16
17@@ -63,7 +69,7 @@
18 pageHeader.resetSearch()
19
20 pageHeader.triggerSearch()
21- typeString("test")
22+ doTypeString("test")
23
24 compare(searchQuery, "test", "Typing in the search field did not change searchQuery")
25 }
26@@ -72,7 +78,7 @@
27 searchEnabled = true
28 pageHeader.triggerSearch()
29 searchQuery = "test1"
30- typeString("test2")
31+ doTypeString("test2")
32 compare(searchQuery, "test1test2", "Setting searchQuery text does not update the TextField")
33 }
34
35@@ -91,28 +97,28 @@
36
37 function test_history() {
38 pageHeader.triggerSearch()
39- typeString("humppa1")
40+ doTypeString("humppa1")
41 pageHeader.resetSearch()
42
43 tryCompare(pageHeader.searchHistory, "count", 1)
44 compare(pageHeader.searchHistory.get(0).query, "humppa1")
45
46 pageHeader.triggerSearch()
47- typeString("humppa2")
48+ doTypeString("humppa2")
49 pageHeader.resetSearch()
50
51 compare(pageHeader.searchHistory.count, 2)
52 compare(pageHeader.searchHistory.get(0).query, "humppa2")
53
54 pageHeader.triggerSearch()
55- typeString("humppa3")
56+ doTypeString("humppa3")
57 pageHeader.resetSearch()
58
59 compare(pageHeader.searchHistory.count, 3)
60 compare(pageHeader.searchHistory.get(0).query, "humppa3")
61
62 pageHeader.triggerSearch()
63- typeString("humppa4")
64+ doTypeString("humppa4")
65 pageHeader.resetSearch()
66
67 compare(pageHeader.searchHistory.count, 3)

Subscribers

People subscribed via source and target branches