From b8218a33d5e5cb5a113bce9865a4e921bfa99e52 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 21 Oct 2016 16:53:16 +0200 Subject: [PATCH] fix(Dialog/ConfirmDialog.spec.qml): use `SignalSpy` --- .../Common/Dialog/ConfirmDialog.spec.qml | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml b/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml index 702d17fe4..d4019e5e0 100644 --- a/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml +++ b/tests/ui/modules/Common/Dialog/ConfirmDialog.spec.qml @@ -11,14 +11,28 @@ TestCase { Component { id: builder - ConfirmDialog {} + Item { + ConfirmDialog { + id: confirmDialog + } + + SignalSpy { + id: spy + + signalName: 'exitStatus' + target: confirmDialog + } + } } function buildConfirmDialog () { - var dialog = builder.createObject(testCase) - verify(dialog) + var container = builder.createObject(testCase) + verify(container) + + var dialog = container.data[0] dialog.closing.connect(dialog.destroy.bind(dialog)) - return dialog + + return container } function test_exitStatusViaButtons_data () { @@ -29,22 +43,22 @@ TestCase { } function test_exitStatusViaButtons (data) { - var dialog = buildConfirmDialog() - - dialog.exitStatus.connect(function (status) { - compare(status, data.expectedStatus) - }) + var container = buildConfirmDialog() + var dialog = container.data[0] + var spy = container.data[1] mouseClick(dialog.buttons[data.button]) + spy.wait(100) + compare(spy.signalArguments[0][0], data.expectedStatus) } function test_exitStatusViaClose () { - var dialog = buildConfirmDialog() - - dialog.exitStatus.connect(function (status) { - compare(status, 0) - }) + var container = buildConfirmDialog() + var dialog = container.data[0] + var spy = container.data[1] dialog.close() + spy.wait(100) + compare(spy.signalArguments[0][0], 0) } }