git.iko.soy/unity8
on xenial help sign in
Add a test
1715f7eJosh Arenson
qml/Dash/PageHeaderExtraPanel.qml+3
compare with xenial
unifiedsplit
@@ -147,6 +147,7 @@ Item {
147
147
148 Flickable {
148 Flickable {
149 id: primaryFilterContainer
149 id: primaryFilterContainer
150+ objectName: "primaryFilterContainer"
150
151
151 readonly property alias active: primaryFilter.active
152 readonly property alias active: primaryFilter.active
152
153
@@ -173,6 +174,8 @@ Item {
173
174
174 Filters.FilterWidgetFactory {
175 Filters.FilterWidgetFactory {
175 id: primaryFilter
176 id: primaryFilter
177+ objectName: "primaryFilter"
178+
176 active: scope && !scope.hasNavigation
179 active: scope && !scope.hasNavigation
177
180
178 anchors.fill: parent
181 anchors.fill: parent
tests/mocks/Unity/fake_scopes.cpp+6−2
@@ -60,8 +60,12 @@ void Scopes::updateScopes()
60 addScope(new Scope("MockScope7", "MS7", false, this));
60 addScope(new Scope("MockScope7", "MS7", false, this));
61 addScope(new Scope("MockScope8", "MS8", false, this));
61 addScope(new Scope("MockScope8", "MS8", false, this));
62 addScope(new Scope("MockScope9", "MS9", false, this));
62 addScope(new Scope("MockScope9", "MS9", false, this));
63− addScope(new Scope("MockScope10", "MS10", true, this, 1, false,
63+ addScope(new Scope("LongPrimaryNavigation", "LongPrimaryNavigation",
64+ true, this, 1, false, QStringList() << "Meat" << "Vegetables" << "BBQ"
65+ << "Burritos" << "Pasta" << "Pancakes" << "Seafood" << "Soup"
64− QStringList() << "Meat" << "Vegetables" << "BBQ" << "Burritos" << "Pasta" << "Pancakes" << "Seafood" << "Soup" << "Bugs" << "Pudding" << "Chocolate" << "Gluten-Free" << "Hamburgers" << "Pho" << "Panang Curry" << "Lumpia" << "Sushi"));
66+ << "Bugs" << "Pudding" << "Chocolate" << "Gluten-Free" << "Hamburgers"
67+ << "Pho" << "Panang Curry" << "Lumpia" << "Sushi"));
68+
65 addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
69 addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
66 m_scopesOverview = new ScopesOverview(this);
70 m_scopesOverview = new ScopesOverview(this);
67
71
tests/qmltests/Dash/tst_Dash.qml+40−1
@@ -18,6 +18,7 @@ import QtQuick 2.4
18import QtTest 1.0
18import QtTest 1.0
19import "../../../qml/Dash"
19import "../../../qml/Dash"
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21+import Unity 0.2 // Access the Filters enum
21import Unity.Test 0.1 as UT
22import Unity.Test 0.1 as UT
22
23
23Item {
24Item {
@@ -57,7 +58,7 @@ Item {
57 tryCompare(dashContentList, "count", 0);
58 tryCompare(dashContentList, "count", 0);
58 scopes.load();
59 scopes.load();
59 tryCompare(dashContentList, "currentIndex", 0);
60 tryCompare(dashContentList, "currentIndex", 0);
60− tryCompare(dashContentList, "count", 6);
61+ tryCompare(dashContentList, "count", 7);
61 tryCompare(scopes, "loaded", true);
62 tryCompare(scopes, "loaded", true);
62 tryCompareFunction(function() {
63 tryCompareFunction(function() {
63 var mockScope1Loader = findChild(dash, "scopeLoader0");
64 var mockScope1Loader = findChild(dash, "scopeLoader0");
@@ -106,6 +107,44 @@ Item {
106 mouseClick(tile);
107 mouseClick(tile);
107 }
108 }
108
109
110+ function test_longNavigationFilterList() {
111+ // Select the scope with long navigation
112+ dash.setCurrentScope("LongPrimaryNavigation")
113+ var dashContent = findChild(dash, "dashContent")
114+ tryCompare(dashContent.currentScope, "id", "LongPrimaryNavigation")
115+
116+ var dashContentList = findChild(dashContent, "dashContentList")
117+ var searchButton = findChild(dashContentList.currentItem, "search_button")
118+ var extraPanel = findChild(dashContentList.currentItem, "peExtraPanel")
119+ tryCompare(extraPanel, "visible", false)
120+
121+ // Open the primaryNavigationFilter
122+ dashContent.currentScope.setHasNavigation(false)
123+ mouseClick(searchButton)
124+ tryCompare(extraPanel, "visible", true)
125+
126+ var primaryFilterContainer = findChild(extraPanel, "primaryFilterContainer")
127+ verify(primaryFilterContainer)
128+
129+ var primaryFilter = findChild(extraPanel, "primaryFilter")
130+ verify(primaryFilter)
131+ tryCompare(primaryFilter, "widgetType", Filters.OptionSelectorFilter)
132+
133+ var genericScopeView = dashContentList.currentItem;
134+ var categoryListView = findChild(genericScopeView, "categoryListView")
135+ verify(categoryListView)
136+ tryCompare(categoryListView, "atYBeginning", true)
137+
138+ var expandingItem = findChild(primaryFilter, "expandingItem")
139+ verify(expandingItem)
140+ expandingItem.expanded = true
141+
142+ wait(250) // FIXME: Wait for the expanding animation to complete
143+ flickToYEnd(primaryFilterContainer)
144+
145+ tryCompare(categoryListView, "atYBeginning", true)
146+ }
147+
109 function test_manage_dash_clickscope_unfavoritable() {
148 function test_manage_dash_clickscope_unfavoritable() {
110 // Show the manage dash
149 // Show the manage dash
111 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
150 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));