git.iko.soy/unity8
on xenial help sign in
Add wait(500) to properly test leftEdgeDrag
95d5403Michael Terry
qml/Shell.qml+1
compare with xenial
unifiedsplit
@@ -444,6 +444,7 @@ Item {
444 Item {
444 Item {
445 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
445 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
446 id: greeterWrapper
446 id: greeterWrapper
447+ objectName: "greeterWrapper"
447 x: greeter.narrowMode ? launcher.progress : 0
448 x: greeter.narrowMode ? launcher.progress : 0
448 y: panel.panelHeight
449 y: panel.panelHeight
449 width: parent.width
450 width: parent.width
tests/qmltests/tst_TabletShell.qml+4−3
@@ -112,7 +112,7 @@ Row {
112
112
113 UT.UnityTestCase {
113 UT.UnityTestCase {
114 id: testCase
114 id: testCase
115− name: "Shell"
115+ name: "TabletShell"
116 when: windowShown
116 when: windowShown
117
117
118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
118 property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
@@ -204,8 +204,8 @@ Row {
204 }
204 }
205
205
206 function confirmLoggedIn(loggedIn) {
206 function confirmLoggedIn(loggedIn) {
207− var greeter = findChild(shell, "greeter")
207+ var greeterWrapper = findChild(shell, "greeterWrapper")
208− tryCompare(greeter, "showProgress", loggedIn ? 0 : 1)
208+ tryCompare(greeterWrapper, "showProgress", loggedIn ? 0 : 1)
209 tryCompare(sessionSpy, "count", loggedIn ? 1 : 0)
209 tryCompare(sessionSpy, "count", loggedIn ? 1 : 0)
210 }
210 }
211
211
@@ -282,6 +282,7 @@ Row {
282 function test_leftEdgeDrag(data) {
282 function test_leftEdgeDrag(data) {
283 selectUser(data.user)
283 selectUser(data.user)
284 swipeFromLeftEdge(shell.width * 0.75)
284 swipeFromLeftEdge(shell.width * 0.75)
285+ wait(500) // to give time to handle dash() signal from Launcher
285 confirmLoggedIn(data.loggedIn)
286 confirmLoggedIn(data.loggedIn)
286 }
287 }
287 }
288 }