1
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
2
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-06-29 14:45:18 +0000
3
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-08-19 11:40:39 +0000
4
@@ -570,53 +570,40 @@
5
570
                genericScopeView.scope = !genericScopeView.scope;
570
                genericScopeView.scope = !genericScopeView.scope;
6
571
            }
571
            }
7
572
572
55
573
            function test_pullToRefresh() {
573
            function test_pullToRefresh_data() {
56
574
                waitForRendering(genericScopeView)
574
                return [
57
575
575
                    { tag: "Tall window long flick", shellHeight: units.gu(100), flickLength: units.gu(70), refresh: true },
58
576
                mouseFlick(genericScopeView,
576
                    { tag: "Tall window short flick", shellHeight: units.gu(100), flickLength: units.gu(25), refresh: false },
59
577
                           genericScopeView.width/2, units.gu(10),
577
                    { tag: "Short window", shellHeight: units.gu(30), flickLength: units.gu(25), refresh: true }
60
578
                           genericScopeView.width/2, units.gu(80),
578
                ];
61
579
                           true, false)
579
            }
62
580
580
63
581
                var pullToRefresh = findChild(genericScopeView, "pullToRefresh")
581
            function test_pullToRefresh(data) {
64
582
                tryCompare(pullToRefresh, "releaseToRefresh", true)
582
                var initialHeight = shell.height;
65
583
583
                shell.height = data.shellHeight;
66
584
                spy.target = genericScopeView.scope
584
                waitForRendering(shell);
67
585
                spy.signalName = "refreshed"
585
68
586
586
                mouseFlick(genericScopeView,
69
587
                mouseRelease(genericScopeView)
587
                           genericScopeView.width/2, units.gu(6),
70
588
                tryCompare(pullToRefresh, "releaseToRefresh", false)
588
                           genericScopeView.width/2, units.gu(6) + data.flickLength,
71
589
589
                           true, false);
72
590
                spy.wait()
590
73
591
                compare(spy.count, 1)
591
                var pullToRefresh = findChild(genericScopeView, "pullToRefresh");
74
592
592
                tryCompare(pullToRefresh, "releaseToRefresh", data.refresh);
75
593
                // test short swipe doesn't refresh on tall window
593
76
594
                mouseFlick(genericScopeView,
594
                spy.target = genericScopeView.scope;
77
595
                           genericScopeView.width/2, units.gu(10),
595
                spy.signalName = "refreshed";
78
596
                           genericScopeView.width/2, units.gu(20),
596
79
597
                           true, false)
597
                mouseRelease(genericScopeView);
80
598
                mouseRelease(genericScopeView)
598
                tryCompare(pullToRefresh, "releaseToRefresh", false);
81
599
                compare(spy.count, 1)
599
82
600
600
                if (data.refresh) {
83
601
                // resize window, repeat the test
601
                    spy.wait();
84
602
                var initialHeight = shell.height
602
                    compare(spy.count, 1);
85
603
                shell.height = units.gu(30)
603
                }
86
604
                waitForRendering(shell)
604
87
605
                mouseFlick(genericScopeView,
605
                shell.height = initialHeight;
88
606
                           genericScopeView.width/2, units.gu(10),
606
                waitForRendering(shell);
42
607
                           genericScopeView.width/2, units.gu(20),
43
608
                           true, false)
44
609
45
610
                tryCompare(pullToRefresh, "releaseToRefresh", true)
46
611
47
612
                mouseRelease(genericScopeView)
48
613
                tryCompare(pullToRefresh, "releaseToRefresh", false)
49
614
50
615
                spy.wait()
51
616
                compare(spy.count, 2)
52
617
53
618
                shell.height = initialHeight
54
619
                waitForRendering(shell)
89
620
            }
607
            }
90
621
608
91
622
            function test_item_noninteractive() {
609
            function test_item_noninteractive() {
Status:	Merged
Approved by:	Albert Astals Cid on 2016-08-23
Approved revision:	2598
Merged at revision:	2613
Proposed branch:	lp:~cimi/unity8/fix-genericscopeview-flakytest
Merge into:	lp:unity8
Diff against target:	91 lines (+34/-47) 1 file modified tests/qmltests/Dash/tst_GenericScopeView.qml (+34/-47)
To merge this branch:	bzr merge lp:~cimi/unity8/fix-genericscopeview-flakytest
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-08-19
Albert Astals Cid (community)		2016-08-19	Approve on 2016-08-19
Review via email: mp+303397@code.launchpad.net