git.iko.soy/unity8
on xenial help sign in
as review
687dec5Andrea Cimitan
qml/Dash/DashPageHeader.qml+1−1
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013,2015 Canonical, Ltd.
2+ * Copyright (C) 2013,2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
tests/qmltests/Dash/tst_DashContent.qml+4−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright (C) 2013,2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -321,7 +321,7 @@ Item {
321
321
322 var headerContainer = findChild(dashContentList.currentItem, "headerContainer");
322 var headerContainer = findChild(dashContentList.currentItem, "headerContainer");
323 tryCompare(headerContainer, "clip", false);
323 tryCompare(headerContainer, "clip", false);
324− verify(headerContainer.state != "search");
324+ verify(headerContainer.state !== "search");
325 mouseClick(searchButton);
325 mouseClick(searchButton);
326 tryCompare(peExtraPanel, "visible", true);
326 tryCompare(peExtraPanel, "visible", true);
327 waitForRendering(navigationListView);
327 waitForRendering(navigationListView);
@@ -386,7 +386,7 @@ Item {
386 compare(peExtraPanel.visible, false);
386 compare(peExtraPanel.visible, false);
387
387
388 tryCompare(headerContainer, "clip", false);
388 tryCompare(headerContainer, "clip", false);
389− verify(headerContainer.state != "search");
389+ verify(headerContainer.state !== "search");
390 mouseClick(searchButton);
390 mouseClick(searchButton);
391 tryCompare(peExtraPanel, "visible", true);
391 tryCompare(peExtraPanel, "visible", true);
392 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
392 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
@@ -547,7 +547,7 @@ Item {
547 mouseClick(cancelButton);
547 mouseClick(cancelButton);
548 tryCompare(headerContainer, "showSearch", false);
548 tryCompare(headerContainer, "showSearch", false);
549 tryCompare(headerContainer, "clip", false);
549 tryCompare(headerContainer, "clip", false);
550− verify(headerContainer.state != "search");
550+ verify(headerContainer.state !== "search");
551
551
552 // test within a navigation
552 // test within a navigation
553 goToSecondLevel();
553 goToSecondLevel();
tests/qmltests/Dash/tst_DashPageHeader.qml+2−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013,2015 Canonical Ltd.
2+ * Copyright (C) 2013,2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ Item {
45 function doResetSearch() {
45 function doResetSearch() {
46 pageHeader.resetSearch();
46 pageHeader.resetSearch();
47 tryCompare(headerContainer, "clip", false);
47 tryCompare(headerContainer, "clip", false);
48− verify(headerContainer.state != "search");
48+ verify(headerContainer.state !== "search");
49 }
49 }
50
50
51 function init() {
51 function init() {