git.iko.soy/unity8
on xenial help sign in
More test fixes.
e4400a2Albert Astals Cid
tests/qmltests/Dash/tst_GenericScopeView.qml+5−21
compare with xenial
unifiedsplit
@@ -84,6 +84,7 @@ Item {
84 genericScopeView.scope = scopes.getScope(2);
84 genericScopeView.scope = scopes.getScope(2);
85 genericScopeView.isCurrent = true;
85 genericScopeView.isCurrent = true;
86 shell.width = units.gu(120);
86 shell.width = units.gu(120);
87+ shell.height = units.gu(100);
87 genericScopeView.categoryView.positionAtBeginning();
88 genericScopeView.categoryView.positionAtBeginning();
88 waitForRendering(genericScopeView.categoryView);
89 waitForRendering(genericScopeView.categoryView);
89 }
90 }
@@ -195,6 +196,8 @@ Item {
195 }
196 }
196
197
197 function test_expand_collapse() {
198 function test_expand_collapse() {
199+ shell.height = units.gu(120);
200+
198 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);
201 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);
199
202
200 var category = findChild(genericScopeView, "dashCategory0")
203 var category = findChild(genericScopeView, "dashCategory0")
@@ -531,6 +534,8 @@ Item {
531 }
534 }
532
535
533 function test_seeAllTwoCategoriesScenario2() {
536 function test_seeAllTwoCategoriesScenario2() {
537+ shell.height = units.gu(120);
538+
534 mockScope.setId("mockScope");
539 mockScope.setId("mockScope");
535 mockScope.setName("Mock Scope");
540 mockScope.setName("Mock Scope");
536 mockScope.isActive = true;
541 mockScope.isActive = true;
@@ -587,7 +592,6 @@ Item {
587 var innerHeader = findChild(header, "innerPageHeader");
592 var innerHeader = findChild(header, "innerPageHeader");
588 verify(innerHeader, "Could not find the inner header");
593 verify(innerHeader, "Could not find the inner header");
589
594
590− expectFail("Apps", "Click scope should not have a favorite button");
591 var favoriteAction = findChild(innerHeader, "favorite_button");
595 var favoriteAction = findChild(innerHeader, "favorite_button");
592 verify(favoriteAction, "Could not find the favorite action.");
596 verify(favoriteAction, "Could not find the favorite action.");
593 mouseClick(favoriteAction);
597 mouseClick(favoriteAction);
@@ -697,26 +701,6 @@ Item {
697 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
701 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
698 compare(shape.borderSource, undefined);
702 compare(shape.borderSource, undefined);
699 }
703 }
700−
701− function test_clickScopeSizing() {
702− genericScopeView.scope = scopes.getScopeFromAll("clickscope");
703− waitForRendering(genericScopeView);
704−
705− var categoryListView = findChild(genericScopeView, "categoryListView");
706− waitForRendering(categoryListView);
707−
708− var categorypredefined = findChild(categoryListView, "dashCategorypredefined");
709− waitForRendering(categorypredefined);
710−
711− var cardTool = findChild(categorypredefined, "cardTool");
712−
713− compare(cardTool.cardWidth, units.gu(11));
714− shell.width = units.gu(46);
715− waitForRendering(genericScopeView);
716− compare(cardTool.cardWidth, units.gu(10));
717−
718− shell.width = units.gu(120)
719− }
720 }
704 }
721 }
705 }
722}
706}