Merge lp:~kalikiana/midori/tstactfixcpy into lp:midori

[Cris Dywan]

Add initial actions unit test starting with page context menu

As a a side effect of using ContextAction we not only gain proper extension API but also better unit test support. I'm making a first step here - for now now only the page menu exposes itself API-wise.

The test actually tests and fixes a bug where Copy may not be sensitive.

[gue5t gue5t (gue5t)]

Looks good to me.

review: Approve

=== modified file 'midori/midori-contextaction.vala'
--- midori/midori-contextaction.vala	2013-07-29 21:42:10 +0000
+++ midori/midori-contextaction.vala	2013-08-02 23:50:36 +0000
@@ -102,6 +102,13 @@
             }
             return menu;
         }
+
+        public Gtk.Action? get_by_name (string name) {
+            foreach (var action in children)
+                if (action.name == name)
+                    return action;
+            return null;
+        }
     }
 
     public class SeparatorContextAction : ContextAction {

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2013-06-21 20:49:53 +0000
+++ midori/midori-searchaction.c	2013-08-02 23:50:36 +0000
@@ -905,6 +905,7 @@
                                           PangoEllipsizeMode ellipsize)
 {
 #ifndef HAVE_WEBKIT2
+    WebKitWebFrame* focused_frame;
     WebKitDOMDocument* doc;
     WebKitDOMHTMLFormElement* active_form;
     WebKitDOMHTMLCollection* form_nodes;
@@ -918,10 +919,13 @@
     KatzeItem* item;
     gchar** parts;
 
+    focused_frame = webkit_web_view_get_focused_frame (web_view);
+    if (focused_frame == NULL)
+        return NULL;
     #if WEBKIT_CHECK_VERSION (1, 9, 5)
-    doc = webkit_web_frame_get_dom_document (webkit_web_view_get_focused_frame (web_view));
+    doc = webkit_web_frame_get_dom_document (focused_frame);
     #else
-    if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
+    if (focused_frame != webkit_web_view_get_main_frame (web_view))
         return NULL;
     doc = webkit_web_view_get_dom_document (web_view);
     #endif

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-08-02 12:00:42 +0000
+++ midori/midori-view.c	2013-08-02 23:50:36 +0000
@@ -2398,7 +2398,12 @@
 
         /* No need to have Copy twice, which is already in the editable menu */
         if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+        {
+            /* Enforce update of copy action - there's no "selection-changed" signal */
             midori_context_action_add_by_name (menu, "Copy");
+            gtk_action_set_sensitive (gtk_action_group_get_action (actions, "Copy"),
+                webkit_web_view_can_copy_clipboard (WEBKIT_WEB_VIEW (view->web_view)));
+        }
 
         /* Ensure view->selected_text */
         midori_view_has_selection (view);

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-08-02 18:00:42 +0000
+++ midori/midori.vapi	2013-08-02 23:50:36 +0000
@@ -190,6 +190,7 @@
         public void populate_popup (Gtk.Menu menu, bool manual);
         public void reload (bool from_cache);
         public Gtk.Widget add_info_bar (Gtk.MessageType type, string message, GLib.Callback? callback, void* object, ...);
+        public ContextAction get_page_context_action (WebKit.HitTestResult hit_test_result);
 
         public string title { get; }
         public Gdk.Pixbuf icon { get; }

=== added file 'tests/actions.vala'
--- tests/actions.vala	1970-01-01 00:00:00 +0000
+++ tests/actions.vala	2013-08-02 23:50:36 +0000
@@ -0,0 +1,63 @@
+/*
+ Copyright (C) 2013 Christian Dywan <[e-mail]>
+
+ This library 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; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+void actions_view_page () {
+    var browser = new Midori.Browser ();
+    var view = new Midori.View.with_title (null, new Midori.WebSettings ());
+    browser.add_tab (view);
+    browser.show ();
+    view.set_html ("<body>The earth is <em>flat</em> for a fact.</body>");
+    var loop = MainContext.default ();
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);
+
+    var hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.DOCUMENT) as WebKit.HitTestResult;
+    var menu = view.get_page_context_action (hit_test_result);
+    assert (menu.name == "PageContextMenu");
+    assert (menu.get_by_name ("Back") != null);
+
+#if !HAVE_WEBKIT2
+    hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult;
+    menu = view.get_page_context_action (hit_test_result);
+    var copy = menu.get_by_name ("Copy");
+    assert (!copy.sensitive);
+    assert (view.web_view.search_text ("flat", true, false, false));
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (copy.sensitive);
+#endif
+
+    /* Reload contents to clear selection */
+    view.set_html ("<body>The earth is <em>flat</em> for a fact.</body>");
+    do { loop.iteration (true); } while (view.load_status != Midori.LoadStatus.FINISHED);
+
+#if !HAVE_WEBKIT2
+    hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.SELECTION) as WebKit.HitTestResult;
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (!copy.sensitive);
+    assert (view.web_view.search_text ("flat", true, false, false));
+    menu = view.get_page_context_action (hit_test_result);
+    copy = menu.get_by_name ("Copy");
+    assert (copy.sensitive);
+#endif
+}
+
+void main (string[] args) {
+    Test.init (ref args);
+    Midori.App.setup (ref args, null);
+    Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
+#if !HAVE_WEBKIT2
+    WebKit.get_default_session ().set_data<bool> ("midori-session-initialized", true);
+#endif
+    Test.add_func ("/actions/view/page", actions_view_page);
+    Test.run ();
+}
+