Merge lp:~zsombi/ubuntu-ui-toolkit/fixActionListTrunk into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Fix ActionList API break.

Fix ActionList API break.

[Zoltan Balogh (bzoltan)]

review: Approve

[Olivier Tilloy (osomon)]

Fixes webbrowser-app context menus and its unit tests.

review: Approve

=== modified file 'components.api'
--- components.api	2016-08-22 16:01:43 +0000
+++ components.api	2016-09-15 15:12:08 +0000
@@ -64,7 +64,8 @@
     property list<Action> actions
     default property list<Action> children
 Ubuntu.Components.ActionList 1.3 ActionList: QtObject
-    default property list<Action> actions
+    property list<Action> actions
+    default property list<Action> children
     signal added(Action action)
     signal removed(Action action)
     function addAction(Action action)
 
=== modified file 'src/Ubuntu/UbuntuToolkit/actionlist.cpp'
--- src/Ubuntu/UbuntuToolkit/actionlist.cpp	2016-07-18 14:54:46 +0000
+++ src/Ubuntu/UbuntuToolkit/actionlist.cpp	2016-09-15 15:12:08 +0000
@@ -79,6 +79,7 @@
     }
     m_actions.append(action);
     Q_EMIT added(action);
+    Q_EMIT childrenChanged();
 }
 
 /*!
@@ -94,6 +95,7 @@
     }
     if (m_actions.removeOne(action)) {
         Q_EMIT removed(action);
+        Q_EMIT childrenChanged();
     }
 }
 
@@ -134,6 +136,7 @@
     ActionList *actionList = qobject_cast<ActionList*>(list->object);
     if (actionList) {
         actionList->m_actions.clear();
+        Q_EMIT actionList->childrenChanged();
     }
 }
 
 
=== modified file 'src/Ubuntu/UbuntuToolkit/actionlist_p.h'
--- src/Ubuntu/UbuntuToolkit/actionlist_p.h	2016-07-18 14:54:46 +0000
+++ src/Ubuntu/UbuntuToolkit/actionlist_p.h	2016-09-15 15:12:08 +0000
@@ -28,7 +28,9 @@
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<UT_PREPEND_NAMESPACE(UCAction)> actions READ actions)
-    Q_CLASSINFO("DefaultProperty", "actions")
+    // children alias
+    Q_PROPERTY(QQmlListProperty<UT_PREPEND_NAMESPACE(UCAction)> children READ actions NOTIFY childrenChanged)
+    Q_CLASSINFO("DefaultProperty", "children")
 public:
     explicit ActionList(QObject *parent = 0);
 
@@ -41,6 +43,7 @@
     void removeAction(UT_PREPEND_NAMESPACE(UCAction) *action);
 
 Q_SIGNALS:
+    void childrenChanged();
     void added(UCAction *action);
     void removed(UCAction *action);
 
 
=== modified file 'tests/unit/components/tst_action.qml'
--- tests/unit/components/tst_action.qml	2016-06-24 13:07:32 +0000
+++ tests/unit/components/tst_action.qml	2016-09-15 15:12:08 +0000
@@ -185,17 +185,6 @@
          compare(checkableAction.checked, false, "Non-checkable action should never be checked");
      }
 
-     function test_actionlist() {
-         verify(actionList.actions.length, 2, "Default actions not added to actionList");
-     }
-
-     function test_actionlist_dynamic_actions() {
-         actionList.addAction(dynamicListAction);
-         verify(actionList.actions.length, 3, "Dynamic action not added to actionList");
-         actionList.removeAction(dynamicListAction);
-         verify(actionList.actions.length, 2, "Dynamic action not remove from actionList");
-     }
-
      function test_exclusive_group() {
          compare(exclusiveGroup.actions.length, 3, "Incorrect number of actions");
      }
@@ -311,18 +300,6 @@
          checkable: true
      }
 
-     ActionList {
-         id: actionList
-         Action {
-         }
-         Action {
-         }
-     }
-
-     Action {
-         id: dynamicListAction
-     }
-
      ExclusiveGroup {
          id: exclusiveGroup
          Action {
 
=== added file 'tests/unit/visual/tst_actionlist.13.qml'
--- tests/unit/visual/tst_actionlist.13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/tst_actionlist.13.qml	2016-09-15 15:12:08 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 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 QtTest 1.0
+import Ubuntu.Test 1.3
+import Ubuntu.Components 1.3
+import QtQuick 2.4
+import Ubuntu.Components.Popups 1.3
+
+Button {
+    id: root
+    width: units.gu(50)
+    height: units.gu(50)
+
+    property Item popup: null
+
+    Component {
+        id: menuFactory
+        ActionSelectionPopover {
+            delegate: ListItemLayout {
+                property Action action
+                title.text: action.text
+            }
+
+            actions: ActionList {
+                Action {
+                    objectName: "foo"
+                    text: "foo"
+                }
+                Action {
+                    objectName: "bar"
+                    text: "bar"
+                }
+            }
+        }
+    }
+    onClicked: popup = PopupUtils.open(menuFactory, root)
+
+    ActionList {
+        id: actionList
+        Action {
+        }
+        Action {
+        }
+    }
+
+    Action {
+        id: dynamicListAction
+    }
+
+    UbuntuTestCase {
+        when: windowShown
+
+        function test_actionlist() {
+            verify(actionList.actions.length, 2, "Default actions not added to actionList");
+        }
+
+        function test_actionlist_dynamic_actions() {
+            actionList.addAction(dynamicListAction);
+            verify(actionList.actions.length, 3, "Dynamic action not added to actionList");
+            actionList.removeAction(dynamicListAction);
+            verify(actionList.actions.length, 2, "Dynamic action not remove from actionList");
+        }
+
+        function test_bug1623841() {
+            mouseClick(root, centerOf(root).x, centerOf(root).y);
+            waitForRendering(root.popup, 500);
+            // check if the delegates are shown
+            verify(findChild(root.popup, "foo_button"));
+            verify(findChild(root.popup, "bar_button"));
+        }
+    }
+}