1
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
2
--- tests/qmltests/Dash/tst_Dash.qml	2016-06-21 08:14:56 +0000
3
+++ tests/qmltests/Dash/tst_Dash.qml	2016-08-18 10:46:51 +0000
4
@@ -631,18 +631,26 @@
5
631
            tryCompare(dashContent.currentScope, "id", "clickscope");
631
            tryCompare(dashContent.currentScope, "id", "clickscope");
6
632
632
7
633
            scrollToCategory("dashCategorypredefined");
633
            scrollToCategory("dashCategorypredefined");
11
634
            var tile = getCategoryDelegate("predefined", 2);
634
            tryCompareFunction(function() {
12
635
            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
635
                    var tile = getCategoryDelegate("predefined", 2);
13
636
            compare(proportionalShape.length, 1);
636
                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
14
637
                    return proportionalShape.length === 1;
15
638
                },
16
639
                true
17
640
            );
18
637
641
19
638
            dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
642
            dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
20
639
            var dashContent = findChild(dash, "dashContent");
643
            var dashContent = findChild(dash, "dashContent");
21
640
            tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
644
            tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
22
641
645
23
642
            scrollToCategory("dashCategory2");
646
            scrollToCategory("dashCategory2");
27
643
            tile = getCategoryDelegate("2", 2);
647
            tryCompareFunction(function() {
28
644
            proportionalShape = findChildsByType(tile, "UCProportionalShape");
648
                    var tile = getCategoryDelegate("2", 2);
29
645
            compare(proportionalShape.length, 1);
649
                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
30
650
                    return proportionalShape.length === 1;
31
651
                },
32
652
                true
33
653
            );
34
646
        }
654
        }
35
647
655
36
648
        function test_tempScopeItemXOnResize()
656
        function test_tempScopeItemXOnResize()
Status:	Merged
Approved by:	Andrea Cimitan on 2016-08-24
Approved revision:	2597
Merged at revision:	2624
Proposed branch:	lp:~aacid/unity8/moreStableDashTestCardIconStyle
Merge into:	lp:unity8
Diff against target:	36 lines (+14/-6) 1 file modified tests/qmltests/Dash/tst_Dash.qml (+14/-6)
To merge this branch:	bzr merge lp:~aacid/unity8/moreStableDashTestCardIconStyle
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2016-08-18	Approve on 2016-08-24
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-08-18
Review via email: mp+303235@code.launchpad.net
1	=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
2	--- tests/qmltests/Dash/tst_Dash.qml 2016-06-21 08:14:56 +0000
3	+++ tests/qmltests/Dash/tst_Dash.qml 2016-08-18 10:46:51 +0000
4	@@ -631,18 +631,26 @@
5	631	tryCompare(dashContent.currentScope, "id", "clickscope");	631	tryCompare(dashContent.currentScope, "id", "clickscope");
6	632		632
7	633	scrollToCategory("dashCategorypredefined");	633	scrollToCategory("dashCategorypredefined");
11	634	var tile = getCategoryDelegate("predefined", 2);	634	tryCompareFunction(function() {
12	635	var proportionalShape = findChildsByType(tile, "UCProportionalShape");	635	var tile = getCategoryDelegate("predefined", 2);
13	636	compare(proportionalShape.length, 1);	636	var proportionalShape = findChildsByType(tile, "UCProportionalShape");
14			637	return proportionalShape.length === 1;
15			638	},
16			639	true
17			640	);
18	637		641
19	638	dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");	642	dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
20	639	var dashContent = findChild(dash, "dashContent");	643	var dashContent = findChild(dash, "dashContent");
21	640	tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");	644	tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
22	641		645
23	642	scrollToCategory("dashCategory2");	646	scrollToCategory("dashCategory2");
27	643	tile = getCategoryDelegate("2", 2);	647	tryCompareFunction(function() {
28	644	proportionalShape = findChildsByType(tile, "UCProportionalShape");	648	var tile = getCategoryDelegate("2", 2);
29	645	compare(proportionalShape.length, 1);	649	var proportionalShape = findChildsByType(tile, "UCProportionalShape");
30			650	return proportionalShape.length === 1;
31			651	},
32			652	true
33			653	);
34	646	}	654	}
35	647		655
36	648	function test_tempScopeItemXOnResize()	656	function test_tempScopeItemXOnResize()