Ensure that we shutdown all resources before existing the test.

A lingering resource will also block the test from exiting.

8 files changed, 11 insertions, 28 deletions

diff --git a/views/accounts/tests/tst_accountsview.qml b/views/accounts/tests/tst_accountsview.qml
index 8d7bc29d..468a0716 100644
--- a/views/accounts/tests/tst_accountsview.qml
+++ b/views/accounts/tests/tst_accountsview.qml
@@ -22,17 +22,11 @@ import QtTest 1.0
 import org.kube.test 1.0
 import "../qml"
 
-TestCase {
+ViewTestCase {
     id: testCase
-    width: 400
-    height: 400
     name: "AccountsView"
     when: windowShown
 
-    function cleanup() {
-        TestStore.shutdownResources();
-    }
-
     function visitChildren(item) {
         console.warn(item)
         for (var i = 0; i < item.children.length; i++) {
diff --git a/views/calendar/tests/tst_calendar.qml b/views/calendar/tests/tst_calendar.qml
index 46f7dba2..20b78ba7 100644
--- a/views/calendar/tests/tst_calendar.qml
+++ b/views/calendar/tests/tst_calendar.qml
@@ -19,11 +19,10 @@
 
 import QtQuick 2.7
 import QtTest 1.0
+import org.kube.test 1.0
 import "../qml"
 
-TestCase {
-    width: 400
-    height: 400
+ViewTestCase {
     name: "Todo"
 
     View {
diff --git a/views/composer/tests/tst_composerview.qml b/views/composer/tests/tst_composerview.qml
index 61668ecb..d3b6a420 100644
--- a/views/composer/tests/tst_composerview.qml
+++ b/views/composer/tests/tst_composerview.qml
@@ -23,10 +23,8 @@ import org.kube.framework 1.0 as Kube
 import org.kube.test 1.0
 import "../qml"
 
-TestCase {
+ViewTestCase {
     id: testCase
-    width: 400
-    height: 400
     name: "ComposerView"
     when: windowShown
 
diff --git a/views/conversation/tests/tst_conversationview.qml b/views/conversation/tests/tst_conversationview.qml
index 186c2634..b85f4cb6 100644
--- a/views/conversation/tests/tst_conversationview.qml
+++ b/views/conversation/tests/tst_conversationview.qml
@@ -23,10 +23,8 @@ import "../qml"
 import org.kube.framework 1.0 as Kube
 import org.kube.test 1.0
 
-TestCase {
+ViewTestCase {
     id: testCase
-    width: 400
-    height: 400
     name: "MailView"
 
     Component {
diff --git a/views/inboxcrusher/tests/tst_inboxcrusher.qml b/views/inboxcrusher/tests/tst_inboxcrusher.qml
index dba4603a..3e756569 100644
--- a/views/inboxcrusher/tests/tst_inboxcrusher.qml
+++ b/views/inboxcrusher/tests/tst_inboxcrusher.qml
@@ -18,10 +18,10 @@
  */
 
 import QtQuick 2.7
-import QtTest 1.0
+import org.kube.test 1.0
 import "../qml"
 
-TestCase {
+ViewTestCase {
     width: 400
     height: 400
     name: "InboxCrusher"
@@ -33,4 +33,5 @@ TestCase {
     function test_start() {
         verify(view)
     }
+
 }
diff --git a/views/log/tests/tst_logview.qml b/views/log/tests/tst_logview.qml
index 8f733b6c..2479172d 100644
--- a/views/log/tests/tst_logview.qml
+++ b/views/log/tests/tst_logview.qml
@@ -23,10 +23,8 @@ import org.kube.framework 1.0 as Kube
 import org.kube.test 1.0
 import "../qml"
 
-TestCase {
+ViewTestCase {
     id: logviewTestcase
-    width: 400
-    height: 400
     name: "LogView"
 
     View {
diff --git a/views/people/tests/tst_peopleview.qml b/views/people/tests/tst_peopleview.qml
index d2764c31..4b940c6d 100644
--- a/views/people/tests/tst_peopleview.qml
+++ b/views/people/tests/tst_peopleview.qml
@@ -22,10 +22,8 @@ import QtTest 1.0
 import org.kube.test 1.0
 import "../qml"
 
-TestCase {
+ViewTestCase {
     id: testCase
-    width: 400
-    height: 400
     name: "PeopleView"
 
     View {
diff --git a/views/search/tests/tst_searchview.qml b/views/search/tests/tst_searchview.qml
index 3aeae109..ead62a9d 100644
--- a/views/search/tests/tst_searchview.qml
+++ b/views/search/tests/tst_searchview.qml
@@ -20,13 +20,10 @@
 import QtQuick 2.7
 import QtTest 1.0
 import "../qml"
-import org.kube.framework 1.0 as Kube
 import org.kube.test 1.0
 
-TestCase {
+ViewTestCase {
     id: testCase
-    width: 400
-    height: 400
     name: "SearchView"
 
     Component {