3558866 · unity8 · git.iko.soy

tests/qmltests/Dash/tst_GenericScopeView.qml+2−2

@@ -461,8 +461,8 @@ Item {

461

462 var innerHeader = findChild(header, "innerPageHeader");

463 verify(innerHeader, "Could not find the inner header");

464− verify(Qt.colorEqual(innerHeader.textColor, data.foreground),

464+ verify(Qt.colorEqual(innerHeader.config.foregroundColor, data.foreground),

465− "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(data.foreground));

465+ "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(data.foreground));

466

467 var background = findChild(header, "headerBackground");

468 verify(background, "Could not find the background");

tests/qmltests/Dash/tst_PreviewListView.qml+2−2

@@ -100,8 +100,8 @@ Rectangle {

100

101 var innerHeader = findChild(header, "innerPageHeader");

102 verify(innerHeader, "Could not find the inner header");

103− verify(Qt.colorEqual(innerHeader.textColor, UbuntuColors.darkGrey),

103+ verify(Qt.colorEqual(innerHeader.config.foregroundColor, UbuntuColors.darkGrey),

104− "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(UbuntuColors.darkGrey));

104+ "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(UbuntuColors.darkGrey));

105

106 var background = findChild(header, "headerBackground");

107 verify(background, "Could not find the background");

tests/qmltests/Panel/tst_IndicatorsBar.qml+1−1

@@ -136,8 +136,8 @@ IndicatorTest {

136 var dataItem = findChild(indicatorsBar, root.originalModelData[data.index]["identifier"] + "-panelItem");

137 verify(dataItem !== null);

138

139+ waitForRendering(dataItem);

139 var mappedPosition = indicatorsBar.mapFromItem(dataItem, dataItem.width/2, dataItem.height/2);

140 var mappedPosition = indicatorsBar.mapFromItem(dataItem, dataItem.width/2, dataItem.height/2);

140−

141 indicatorsBar.selectItemAt(mappedPosition.x);

142 indicatorsBar.expanded = true;

143 wait_for_expansion_to_settle();