on xenial help sign in
Merge fixQmlTestsNewSDK
3072040Albert Astals Cid
tests/autopilot/unity8/dash.py+1−1
@@ -158,7 +158,7 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
158 def enter_search_query(self, query, keyboard):
158 def enter_search_query(self, query, keyboard):
159 current_header = self._get_current_page_header()
159 current_header = self._get_current_page_header()
160 search_button = \
160 search_button = \
161− current_header.select_single(objectName="search_action_button")
161+ current_header.select_single(objectName="search_button")
162 self.pointing_device.move(
162 self.pointing_device.move(
163 search_button.globalRect.x + search_button.width / 2,
163 search_button.globalRect.x + search_button.width / 2,
164 search_button.globalRect.y + search_button.height / 2)
164 search_button.globalRect.y + search_button.height / 2)
tests/qmltests/Dash/tst_Dash.qml+1−1
@@ -319,7 +319,7 @@ Item {
319
319
320 // Click on the store
320 // Click on the store
321 var scopesListPageHeader = findChild(scopesList, "pageHeader");
321 var scopesListPageHeader = findChild(scopesList, "pageHeader");
322− var searchButton = findChild(scopesListPageHeader, "store_action_button");
322+ var searchButton = findChild(scopesListPageHeader, "store_button");
323 mouseClick(searchButton);
323 mouseClick(searchButton);
324
324
325 spy.wait();
325 spy.wait();
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2
@@ -434,7 +434,7 @@ Item {
434 // open
434 // open
435 tryCompare(testCase.subPageLoader, "open", false);
435 tryCompare(testCase.subPageLoader, "open", false);
436 tryCompare(testCase.subPageLoader, "visible", false);
436 tryCompare(testCase.subPageLoader, "visible", false);
437− var settings = findChild(innerHeader, "settings_action_button");
437+ var settings = findChild(innerHeader, "settings_button");
438 mouseClick(settings);
438 mouseClick(settings);
439 tryCompare(testCase.subPageLoader, "open", true);
439 tryCompare(testCase.subPageLoader, "open", true);
440 tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
440 tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
@@ -582,7 +582,7 @@ Item {
582 verify(innerHeader, "Could not find the inner header");
582 verify(innerHeader, "Could not find the inner header");
583
583
584 expectFail("Apps", "Click scope should not have a favorite button");
584 expectFail("Apps", "Click scope should not have a favorite button");
585− var favoriteAction = findChild(innerHeader, "favorite_action_button");
585+ var favoriteAction = findChild(innerHeader, "favorite_button");
586 verify(favoriteAction, "Could not find the favorite action.");
586 verify(favoriteAction, "Could not find the favorite action.");
587 mouseClick(favoriteAction);
587 mouseClick(favoriteAction);
588
588