Merge lp:~elopio/ubuntu-ui-toolkit/closeActionsPopover-test_modules into lp:~tpeeters/ubuntu-ui-toolkit/closeActionsPopover

[Leo Arias]

Moved the regression test to the components module.

[Tim Peeters (tpeeters)]

the branch to merge this into already went into our staging. Please resubmit

review: Needs Resubmitting

[lp:~elopio/ubuntu-ui-toolkit/closeActionsPopover-test_modules]

1102. By Leo Arias on 2014-06-27

Merged with staging.

Unmerged revisions

1102. By Leo Arias on 2014-06-27

Merged with staging.

1101. By Leo Arias on 2014-06-10

Fixed flake.

1100. By Leo Arias on 2014-06-10

Moved the regression test to the components module.

=== added directory 'tests/autopilot/ubuntuuitoolkit/tests/components'
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/__init__.py	2014-06-10 17:58:34 +0000
@@ -0,0 +1,24 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the Ubuntu UI Toolkit components."""
+
+
+# Note that the feedback loop that you get from testing QML components with
+# Autopilot is bigger than what you would get by doing it with QtTest.
+# So, the QML components need to be tested first in isolation at a lower level
+# with QtTest, leaving Autopilot to test complex user interactions or user
+# stories.

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_header.HeaderTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_header.HeaderTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_header.HeaderTestCase.qml	2014-06-10 17:58:34 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    useDeprecatedToolbar: false
+
+    PageStack {
+        id: stack
+        Component.onCompleted: stack.push(page)
+
+        Page {
+            title: "Test title"
+            id: page
+
+            tools: ToolbarItems {
+
+                Repeater {
+                    id: buttonRepeater
+                    model: 5
+                    ToolbarButton {
+                        action: Action {
+                            objectName: "action" + index
+                            text: "text " + index
+                            iconName: "add"
+                        }
+                    }
+                }
+
+                ToolbarButton {
+                    action: Action {
+                        objectName: "pushStackAction"
+                        text: "Push page"
+                        iconName: "add"
+                        onTriggered: stack.push(pushMe)
+                    }
+                }
+            }
+        }
+
+        Page {
+            title: "Pushed page"
+            id: pushMe
+        }
+    }
+}

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	2014-06-10 17:58:34 +0000
@@ -0,0 +1,48 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the Ubuntu UI Toolkit Header component."""
+
+import os
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+from ubuntuuitoolkit import tests
+
+
+class HeaderTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_header.HeaderTestCase.qml')
+
+    def setUp(self):
+        super(HeaderTestCase, self).setUp()
+        self.header = self.main_view.get_header()
+
+    def test_click_header_overflow_action_must_close_popover(self):
+        """Test that clicking an action from the popover must close it.
+
+        Regression test for http://pad.lv/1326963
+
+        """
+        overflow_popover = self.main_view.select_single(
+            'Popover',
+            objectName='actions_overflow_popover')
+        self.header.click_action_button('pushStackAction')
+        self.assertThat(overflow_popover.visible, Eventually(Equals(False)))

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-05 21:21:44 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-10 17:58:34 +0000
@@ -18,8 +18,6 @@
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
-from testtools.matchers import Equals
-from autopilot.matchers import Eventually
 
 
 class HeaderTestCase(tests.QMLStringAppTestCase):
@@ -34,93 +32,73 @@
 
     useDeprecatedToolbar: false
 
-    PageStack {
-        id: stack
-        Component.onCompleted: stack.push(page)
-
-        Page {
-            title: "Test title"
-            id: page
-
-            Flickable {
-                anchors.fill: parent
-                contentHeight: units.gu(120)
-                objectName: "header_test_flickable"
-
-                Label {
-                    id: label
-                    objectName: "clicked_label"
-                    anchors {
-                        top: parent.top
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    text: "No button clicked."
-                }
-
-                Button {
-                    objectName: "hide_actions_button"
-                    anchors {
-                        top: label.bottom
-                        topMargin: units.gu(5)
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    text: "Hide some actions"
-                    onClicked: {
-                        cancelAction.visible = false;
-                        for (var i=0; i < 3; i++) {
-                            buttonRepeater.itemAt(i).action.visible = false;
-                        }
-                        // only three of five visible actions left
-                    }
-                }
-                Label {
-                    id: endLabel
-                    objectName: "end_label"
-                    anchors {
-                        bottom: parent.bottom
-                        horizontalCenter: parent.horizontalCenter
-                    }
-                    text: "The end."
-                }
-            }
-
-            tools: ToolbarItems {
-                back: ToolbarButton {
-                    action: Action {
-                        id: cancelAction
-                        iconName: "cancel"
-                        text: "cancel"
-                        onTriggered: label.text = "Cancel button clicked."
-                    }
-                }
-                Repeater {
-                    id: buttonRepeater
-                    model: 5
-                    ToolbarButton {
-                        action: Action {
-                            objectName: "action" + index
-                            text: "text " + index
-                            iconName: "add"
-                            onTriggered: {
-                                label.text = "Button "+index+" clicked.";
-                            }
-                        }
-                    }
-                }
+    Page {
+        title: "Test title"
+
+        Flickable {
+            anchors.fill: parent
+            contentHeight: units.gu(120)
+            objectName: "header_test_flickable"
+
+            Label {
+                id: label
+                objectName: "clicked_label"
+                anchors {
+                    top: parent.top
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "No button clicked."
+            }
+
+            Button {
+                objectName: "hide_actions_button"
+                anchors {
+                    top: label.bottom
+                    topMargin: units.gu(5)
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "Hide some actions"
+                onClicked: {
+                    cancelAction.visible = false;
+                    for (var i=0; i < 3; i++) {
+                        buttonRepeater.itemAt(i).action.visible = false;
+                    }
+                    // only three of five visible actions left
+                }
+            }
+            Label {
+                id: endLabel
+                objectName: "end_label"
+                anchors {
+                    bottom: parent.bottom
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "The end."
+            }
+        }
+
+        tools: ToolbarItems {
+            back: ToolbarButton {
+                action: Action {
+                    id: cancelAction
+                    iconName: "cancel"
+                    text: "cancel"
+                    onTriggered: label.text = "Cancel button clicked."
+                }
+            }
+            Repeater {
+                id: buttonRepeater
+                model: 5
                 ToolbarButton {
                     action: Action {
-                        objectName: "pushStackAction"
-                        text: "Push page"
+                        objectName: "action" + index
+                        text: "text " + index
                         iconName: "add"
-                        onTriggered: stack.push(pushMe)
+                        onTriggered: label.text = "Button "+index+" clicked."
                     }
                 }
             }
         }
-        Page {
-            title: "Pushed page"
-            id: pushMe
-        }
     }
 }
 """)
@@ -147,13 +125,6 @@
         self.header.click_action_button('action3')
         self.assertEqual(self.label.text, 'Button 3 clicked.')
 
-    def test_click_header_overflow_action_closes_popover_bug1326963(self):
-        overflow_popover = self.main_view.select_single(
-            'Popover',
-            objectName='actions_overflow_popover')
-        self.header.click_action_button('pushStackAction')
-        self.assertThat(overflow_popover.visible, Eventually(Equals(False)))
-
     def test_click_unexisting_header_action_button(self):
         error = self.assertRaises(
             ubuntuuitoolkit.ToolkitException, self.header.click_action_button,