Merge lp:~kissiel/checkbox/dryify-checkbox-converged into lp:checkbox

[Maciej Kisielewski]

This MR does three things to make checkbox-converged more DRY.

1) Introduces actions components, so pages don't have to redefine their look & feel.
2) Introduces a component based on ColumnLayout that is common among pages that display tests.
3) Introduces a helper function for dynamic page creation that checks wether the loaded file is a proper, error-free qml stuff.

and of course it applies those three to the code.

22523b2 checkbox-touch:autopilot: don't require autopilot (not autopilot3)
9798a93 checkbox-touch: add AddCommentAction as a distinct component
f0f9eaa checkbox-touch: add SkipAction as a distinct component
6e9bc85 checkbox-touch: use action components on ManualIntroPage
552821f checkbox-touch: use action components on InteractIntroPage
ba28672 checkbox-touch: use action components on UserInteractSummary
dd8ea8c checkbox-touch: use action components on TestVerificationPage
be2496d checkbox-touch: use action components on QmlNativePage
5879de1 checkbox-touch: use action components on QmlConfinedPage
4b089a0 checkbox-touch: add TestPageBody component
0ac3579 checkbox-touch: use TestPageBody in AutomatedTestPage
b7a9fa2 checkbox-touch: use TestPageBody in InteractIntroPage
ef931b7 checkbox-touch: use TestPageBody in ManualIntroPage
5eb08e4 checkbox-touch: use TestPageBody in TestVerificationPage
889ae91 checkbox-touch: use TestPageBody in UserInteractSummaryPage
1cc717d checkbox-touch: use TestPageBody in QmlConfinedPage
19cfda1 checkbox-touch: use TestPageBody in QmlNativePage
c46562f checkbox-touch: remove dead code
b73193d checkbox-touch: add `createPage` helper
0149d03 checkbox-touch: use `createPage` helper throughout the app

[Zygmunt Krynicki (zyga)]

Really pleasant review, Thanks :-)

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2015-09-08 18:33:18 +0000
+++ checkbox-touch/checkbox-touch.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Zygmunt Krynicki <[e-mail]>
@@ -400,6 +400,27 @@
         visible: false
         __customHeaderContents: progressHeader;
     }
+    /*
+     * Create a page from a Component defined in `url` with a common
+     * progress header if `test` is supplied.
+     * If Component definition has errors, display a proper popup.
+     */
+    function createPage(url, test) {
+        var pageComponent = Qt.createComponent(Qt.resolvedUrl(url));
+        if (pageComponent.status == Component.Error) {
+            var msg = i18n.tr("Could not create component '") + url + "'\n" + pageComponent.errorString();
+            console.error(msg);
+            ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
+        } else {
+            var pageObject = pageComponent.createObject();
+            if (test) {
+                pageObject.test = test;
+                pageObject.__customHeaderContents = progressHeader;
+                progressHeader.update(test)
+            }
+            return pageObject;
+        }
+    }
 
     function resumeOrStartSession() {
         app.isSessionResumable(function(result) {
@@ -501,7 +522,7 @@
     function showResultsScreen() {
         pageStack.clear();
         app.getResults(function(results) {
-            var resultsPage = Qt.createComponent(Qt.resolvedUrl("components/ResultsPage.qml")).createObject();
+            var resultsPage = createPage("components/ResultsPage.qml");
             resultsPage.results = results;
             if (appSettings["submission"]) {
                 resultsPage.submissionName = appSettings["submission"].name;
@@ -558,29 +579,22 @@
     }
 
     function performAutomatedTest(test) {
-        var automatedTestPage = Qt.createComponent(Qt.resolvedUrl("components/AutomatedTestPage.qml")).createObject();
-        automatedTestPage.test = test;
-        automatedTestPage.__customHeaderContents = progressHeader;
-        progressHeader.update(test);
+        var automatedTestPage = createPage("components/AutomatedTestPage.qml", test);
         pageStack.push(automatedTestPage);
         runTestActivity(test, completeTest);
     }
 
     function performManualTest(test) {
         runTestActivity(test, function(test) {
-            var manualIntroPage = Qt.createComponent(Qt.resolvedUrl("components/ManualIntroPage.qml")).createObject();
-            manualIntroPage.test = test
+            var manualIntroPage = createPage("components/ManualIntroPage.qml", test);
             manualIntroPage.testDone.connect(completeTest);
             manualIntroPage.continueClicked.connect(function() { showVerificationScreen(test); });
-            manualIntroPage.__customHeaderContents = progressHeader;
-            progressHeader.update(test);
             pageStack.push(manualIntroPage);
         });
     }
 
     function performUserInteractVerifyTest(test) {
-        var InteractIntroPage = Qt.createComponent(Qt.resolvedUrl("components/InteractIntroPage.qml")).createObject();
-        InteractIntroPage.test = test;
+        var InteractIntroPage = createPage("components/InteractIntroPage.qml", test);
         InteractIntroPage.testStarted.connect(function() {
             runTestActivity(test, function(test) {
                 InteractIntroPage.stopActivity();
@@ -588,75 +602,51 @@
             });
         });
         InteractIntroPage.testDone.connect(completeTest);
-        InteractIntroPage.__customHeaderContents = progressHeader;
-        progressHeader.update(test);
         pageStack.push(InteractIntroPage);
     }
 
     function performUserInteractTest(test) {
-        var InteractIntroPage = Qt.createComponent(Qt.resolvedUrl("components/InteractIntroPage.qml")).createObject();
-        InteractIntroPage.test = test;
+        var InteractIntroPage = createPage("components/InteractIntroPage.qml", test);
         InteractIntroPage.testStarted.connect(function() {
             runTestActivity(test, function(test) {
                 InteractIntroPage.stopActivity();
-                var userInteractSummaryPage = Qt.createComponent(Qt.resolvedUrl("components/UserInteractSummaryPage.qml")).createObject();
-                userInteractSummaryPage.test = test;
+                var userInteractSummaryPage = createPage("components/UserInteractSummaryPage.qml", test);
                 userInteractSummaryPage.testDone.connect(completeTest);
-                userInteractSummaryPage.__customHeaderContents = progressHeader;
-                progressHeader.update(test);
                 pageStack.push(userInteractSummaryPage);
             });
         });
         InteractIntroPage.testDone.connect(completeTest);
-        InteractIntroPage.__customHeaderContents = progressHeader;
-        progressHeader.update(test);
         pageStack.push(InteractIntroPage);
     }
 
     function performUserVerifyTest(test) {
-        var InteractIntroPage = Qt.createComponent(Qt.resolvedUrl("components/InteractIntroPage.qml")).createObject();
-        InteractIntroPage.test = test;
+        var InteractIntroPage = createPage("components/InteractIntroPage.qml", test);
         InteractIntroPage.testDone.connect(completeTest);
         InteractIntroPage.testStarted.connect(function() {
             runTestActivity(test, function(test) { showVerificationScreen(test); } );
         });
-        InteractIntroPage.__customHeaderContents = progressHeader;
-        progressHeader.update(test);
         pageStack.push(InteractIntroPage);
     }
 
     function performQmlTest(test) {
         runTestActivity(test, function(test) {
-            var comp = Qt.createComponent(Qt.resolvedUrl("components/QmlNativePage.qml"))
-            console.log(comp.errorString());
-            var qmlNativePage = comp.createObject();
-            qmlNativePage.test = test
+            var qmlNativePage = createPage("components/QmlNativePage.qml", test);
             qmlNativePage.testDone.connect(completeTest);
-            qmlNativePage.__customHeaderContents = progressHeader;
-            progressHeader.update(test);
             pageStack.push(qmlNativePage);
         });
     }
     function performConfinedQmlTest(test) {
         runTestActivity(test, function(test) {
-            var comp = Qt.createComponent(Qt.resolvedUrl("components/QmlConfinedPage.qml"))
-            console.log(comp.errorString());
-            var qmlNativePage = comp.createObject();
-            qmlNativePage.test = test
+            var qmlNativePage = createPage("components/QmlConfinedPage.qm;");
             qmlNativePage.applicationVersion = app.applicationVersion;
             qmlNativePage.testDone.connect(completeTest);
-            qmlNativePage.__customHeaderContents = progressHeader;
-            progressHeader.update(test);
             pageStack.push(qmlNativePage);
         });
     }
 
     function showVerificationScreen(test) {
-        var verificationPage = Qt.createComponent(Qt.resolvedUrl("components/TestVerificationPage.qml")).createObject();
-        verificationPage.test = test
+        var verificationPage = createPage("components/TestVerificationPage.qml", test);
         verificationPage.testDone.connect(completeTest);
-        verificationPage.__customHeaderContents = progressHeader;
-        progressHeader.update(test);
         pageStack.push(verificationPage);
     }
     function getSubmissionInput(continuation, cancelContinuation) {
@@ -672,7 +662,6 @@
         var process_input = function() {
             if (input_vars.length > 0) {
                 var input = input_vars.shift();
-                var dlg_cmp = Qt.createComponent(Qt.resolvedUrl("components/InputDialog.qml"));
                 var dlg = Qt.createComponent(Qt.resolvedUrl("components/InputDialog.qml")).createObject(mainView);
                 dlg.prompt = input.prompt;
                 dlg.textEntered.connect(function(text) {

=== modified file 'checkbox-touch/components/AutomatedTestPage.qml'
--- checkbox-touch/components/AutomatedTestPage.qml	2015-07-17 08:36:57 +0000
+++ checkbox-touch/components/AutomatedTestPage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -40,32 +40,9 @@
 
     visible: false
 
-    ColumnLayout {
-        spacing: units.gu(3)
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            Layout.alignment: Qt.AlignLeft
-            text: test["name"]
-            font.bold: true
-        }
-
-        Label {
-            fontSize: "medium"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["description"]
-        }
+    TestPageBody {
+        header: test["name"]
+        body: test["description"]
     }
     ColumnLayout {
         anchors {

=== modified file 'checkbox-touch/components/InteractIntroPage.qml'
--- checkbox-touch/components/InteractIntroPage.qml	2015-09-11 13:28:35 +0000
+++ checkbox-touch/components/InteractIntroPage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -30,7 +30,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import QtQuick.Layouts 1.1
-import "ConfirmationLogic.js" as ConfirmationLogic
+import "actions"
 
 Page {
     id: userInteractVerifyIntroPage
@@ -48,36 +48,9 @@
     title: i18n.tr("Test Description")
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
+            AddCommentAction {},
+            SkipAction {
                 id: skipAction
-                objectName: "skip"
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(userInteractVerifyIntroPage,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                testDone(test);
-                            }
-                    });
-                }
             }
         ]
     }
@@ -96,34 +69,9 @@
          }
      ]
 
-    ColumnLayout {
-        id: descriptionContent
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            objectName: "testNameLabel"
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
-
-        Label {
-            fontSize: "medium"
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["description"]
-        }
-
+    TestPageBody {
+        header: test["name"]
+        body: test["description"]
         ActivityIndicator {
             id: activity
             Layout.alignment: Qt.AlignHCenter

=== modified file 'checkbox-touch/components/ManualIntroPage.qml'
--- checkbox-touch/components/ManualIntroPage.qml	2015-09-14 08:28:09 +0000
+++ checkbox-touch/components/ManualIntroPage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -29,7 +29,7 @@
 import Ubuntu.Components 1.1
 import QtQuick.Layouts 1.1
 import Ubuntu.Components.Popups 0.1
-import "ConfirmationLogic.js" as ConfirmationLogic
+import "actions"
 
 Page {
     id: manualIntroPage
@@ -42,72 +42,14 @@
     title: i18n.tr("Test Description")
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
-                id: skipAction
-                objectName: "skip"
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(manualIntroPage,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                testDone(test);
-                            }
-                    });
-                }
-            }
+            AddCommentAction {},
+            SkipAction {}
         ]
     }
 
-    ColumnLayout {
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
-
-        Flickable {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            contentHeight: childrenRect.height
-            flickableDirection: Flickable.VerticalFlick
-            clip: true
-            Label {
-                fontSize: "medium"
-                anchors.fill: parent
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: test["description"]
-            }
-        }
-
+    TestPageBody {
+        header: test["name"]
+        body: test["description"]
         Button {
             objectName: "continueButton"
             color: UbuntuColors.green

=== modified file 'checkbox-touch/components/QmlConfinedPage.qml'
--- checkbox-touch/components/QmlConfinedPage.qml	2015-09-14 08:28:09 +0000
+++ checkbox-touch/components/QmlConfinedPage.qml	2015-09-15 12:54:51 +0000
@@ -26,8 +26,8 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import QtQuick.Layouts 1.1
-import "ConfirmationLogic.js" as ConfirmationLogic
 import Ubuntu.Content 1.1
+import "actions"
 
 Page {
     id: qmlNativePage
@@ -76,71 +76,14 @@
 
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
-                id: skipAction
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(qmlNativePage,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                testDone(test);
-                            }
-                    });
-                }
-            }
+            AddCommentAction {},
+            SkipAction {}
         ]
     }
 
-    ColumnLayout {
-        id: body
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
-
-        Flickable {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            contentHeight: childrenRect.height
-            flickableDirection: Flickable.VerticalFlick
-            clip: true
-            Label {
-                fontSize: "medium"
-                anchors.fill: parent
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: test["description"]
-            }
-        }
+    TestPageBody {
+        header: test["name"]
+        body: test["description"]
 
         ColumnLayout {
             id: busyIndicatorGroup

=== modified file 'checkbox-touch/components/QmlNativePage.qml'
--- checkbox-touch/components/QmlNativePage.qml	2015-09-14 08:28:09 +0000
+++ checkbox-touch/components/QmlNativePage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -26,7 +26,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import QtQuick.Layouts 1.1
-import "ConfirmationLogic.js" as ConfirmationLogic
+import "actions"
 
 Page {
     id: qmlNativePage
@@ -49,71 +49,14 @@
 
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
-                id: skipAction
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(qmlNativePage,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                testDone(test);
-                            }
-                    });
-                }
-            }
+            AddCommentAction {},
+            SkipAction {}
         ]
     }
 
-    ColumnLayout {
-        id: body
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
-
-        Flickable {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            contentHeight: childrenRect.height
-            flickableDirection: Flickable.VerticalFlick
-            clip: true
-            Label {
-                fontSize: "medium"
-                anchors.fill: parent
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: test["description"]
-            }
-        }
+    TestPageBody {
+        header: test["name"]
+        body: test["description"]
 
         LatchButton {
             objectName: "continueButton"

=== added file 'checkbox-touch/components/TestPageBody.qml'
--- checkbox-touch/components/TestPageBody.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/TestPageBody.qml	2015-09-15 12:54:51 +0000
@@ -0,0 +1,77 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*! \brief ColumnLayout components with header and body labels already included
+ *  and some common UX properties already set.
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+
+ColumnLayout {
+    /* this property is the text to be shown in the top label */
+    property var header: ""
+
+    /* this property is the text that's used as the main body of the page. It
+     * will be wrapping itself, filling width of the page (column), and will be
+     * flickable */
+    property var body: ""
+
+    /* set fullHeightBody to false if you want to have control over layout in
+     * the code that uses TestPageBody. You might want for instance have one
+     * item that dominates the page.
+     * If left set as true the layout is split evenly between children. */
+    property var fullHeightBody: true
+
+    spacing: units.gu(3)
+    anchors {
+        fill: parent
+        topMargin: units.gu(3)
+        bottomMargin: units.gu(3)
+        leftMargin: units.gu(1)
+        rightMargin: units.gu(1)
+    }
+
+    Label {
+        objectName: "headerLabel"
+        fontSize: "large"
+        Layout.fillWidth: true
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        text: header
+        font.bold: true
+    }
+
+    Flickable {
+        Layout.fillWidth: true
+        Layout.fillHeight: fullHeightBody
+        contentHeight: childrenRect.height
+        flickableDirection: Flickable.VerticalFlick
+        clip: true
+        Label {
+            fontSize: "medium"
+            anchors.fill: parent
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            text: body
+        }
+    }
+}

=== modified file 'checkbox-touch/components/TestVerificationPage.qml'
--- checkbox-touch/components/TestVerificationPage.qml	2015-09-14 08:42:00 +0000
+++ checkbox-touch/components/TestVerificationPage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -29,7 +29,7 @@
 import Ubuntu.Components 1.1
 import QtQuick.Layouts 1.1
 import Ubuntu.Components.Popups 0.1
-import "ConfirmationLogic.js" as ConfirmationLogic
+import "actions"
 
 Page {
     id: testVerification
@@ -42,71 +42,14 @@
 
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
-                objectName: "skip"
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(testVerification,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                latchingTestDone();
-                            }
-                    });
-                }
-            }
+            AddCommentAction {},
+            SkipAction {}
         ]
     }
 
-    ColumnLayout {
-        id: descriptionContent
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
-
-        Flickable {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            contentHeight: childrenRect.height
-            flickableDirection: Flickable.VerticalFlick
-            clip: true
-            Label {
-                fontSize: "medium"
-                anchors.fill: parent
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: test["verificationDescription"]
-            }
-        }
+    TestPageBody {
+        header: test["name"]
+        body: test["verificationDescription"]
 
         Button {
             id: showOutputButton

=== modified file 'checkbox-touch/components/UserInteractSummaryPage.qml'
--- checkbox-touch/components/UserInteractSummaryPage.qml	2015-09-11 13:28:35 +0000
+++ checkbox-touch/components/UserInteractSummaryPage.qml	2015-09-15 12:54:51 +0000
@@ -1,7 +1,7 @@
 /*
  * This file is part of Checkbox
  *
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014, 2015 Canonical Ltd.
  *
  * Authors:
  * - Maciej Kisielewski <[e-mail]>
@@ -29,7 +29,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import QtQuick.Layouts 1.1
-import "ConfirmationLogic.js" as ConfirmationLogic
+import "actions"
 
 Page {
     id: userInteractSummary
@@ -42,55 +42,14 @@
 
     head {
         actions: [
-            Action {
-                id: addCommentAction
-                iconName: "note-new"
-                text: i18n.tr("Add comment")
-                onTriggered: {
-                    commentsDialog.commentDefaultText = test["comments"] || "";
-                    commentsDialog.commentAdded.connect(function(comment) {
-                        test["comments"] = comment;
-                    });
-                    PopupUtils.open(commentsDialog.dialogComponent);
-                }
-            },
-            Action {
-                iconName: "media-seek-forward"
-                text: i18n.tr("Skip")
-                onTriggered: {
-                    var confirmationOptions = {
-                        question : i18n.tr("Do you really want to skip this test?"),
-                        remember : true,
-                    }
-                    ConfirmationLogic.confirmRequest(userInteractSummary,
-                        confirmationOptions, function(res) {
-                            if (res) {
-                                test["outcome"] = "skip";
-                                testDone(test);
-                            }
-                    });
-                }
-            }
+            AddCommentAction {},
+            SkipAction {}
         ]
     }
 
-    ColumnLayout {
-        spacing: units.gu(3)
-        anchors {
-            fill: parent
-            topMargin: units.gu(3)
-            bottomMargin: units.gu(3)
-            leftMargin: units.gu(1)
-            rightMargin: units.gu(1)
-        }
-
-        Label {
-            fontSize: "large"
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: test["name"]
-            font.bold: true
-        }
+    TestPageBody {
+        header: test["name"]
+        fullHeightBody: false
 
         Row {
             Layout.fillWidth: true

=== added directory 'checkbox-touch/components/actions'
=== added file 'checkbox-touch/components/actions/AddCommentAction.qml'
--- checkbox-touch/components/actions/AddCommentAction.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/actions/AddCommentAction.qml	2015-09-15 12:54:51 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*! \brief Action component for adding a comment. */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+
+Action {
+    id: addCommentAction
+    iconName: "note-new"
+    text: i18n.tr("Add comment")
+    onTriggered: {
+        commentsDialog.commentDefaultText = test["comments"] || "";
+        commentsDialog.commentAdded.connect(function(comment) {
+            test["comments"] = comment;
+        });
+        PopupUtils.open(commentsDialog.dialogComponent);
+    }
+}

=== added file 'checkbox-touch/components/actions/SkipAction.qml'
--- checkbox-touch/components/actions/SkipAction.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/actions/SkipAction.qml	2015-09-15 12:54:51 +0000
@@ -0,0 +1,47 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*! \brief Action component for skipping a test. */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+import "../ConfirmationLogic.js" as ConfirmationLogic
+
+Action {
+    id: skipAction
+    objectName: "skip"
+    iconName: "media-seek-forward"
+    text: i18n.tr("Skip")
+    onTriggered: {
+        var confirmationOptions = {
+            question : i18n.tr("Do you really want to skip this test?"),
+            remember : true,
+        }
+        ConfirmationLogic.confirmRequest(mainView,
+            confirmationOptions, function(res) {
+                if (res) {
+                    test["outcome"] = "skip";
+                    testDone(test);
+                }
+        });
+    }
+}

=== modified file 'checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	2015-08-31 10:53:52 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	2015-09-15 12:54:51 +0000
@@ -133,7 +133,7 @@
         intro_page = self.app.wait_select_single(
             objectName='userInteractVerifyIntroPage', visible=True)
         test_name_label = intro_page.wait_select_single(
-            objectName='testNameLabel', visible=True)
+            objectName='headerLabel', visible=True)
         self.assertThat(test_name_label.text,
                         Eventually(Equals('autopilot/user-verify-1')))
 
@@ -149,7 +149,7 @@
         intro_page = self.app.wait_select_single(
             objectName='userInteractVerifyIntroPage', visible=True)
         test_name_label = intro_page.wait_select_single(
-            objectName='testNameLabel', visible=True)
+            objectName='headerLabel', visible=True)
         self.assertThat(test_name_label.text,
                         Eventually(Equals('autopilot/user-verify-2')))
 

=== modified file 'checkbox-touch/tests/autopilot/run'
--- checkbox-touch/tests/autopilot/run	2015-08-28 20:07:21 +0000
+++ checkbox-touch/tests/autopilot/run	2015-09-15 12:54:51 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
+if [[ -z `which autopilot3` ]]; then
   echo "Autopilot is not installed. Skip"
   exit 1
 fi