Merge pull request #74 from sorryforthecommit/fix_invoice_steuernews

Fix invoice steuernews

Author: jscarty

lib/WWW/WebKit2.pm

@@ -28,7 +28,7 @@ None by default.
 
 =cut
 
-use 5.10.0;
+use 5.18.0;
 use Moose;
 
 with 'WWW::WebKit2::Cookies';
@@ -263,6 +263,11 @@ has 'log_path' => (
     default => '/tmp/webkit2_log/',
 );
 
+has 'active_navigation_action' => (
+    is      => 'rw',
+    default => 0,
+);
+
 =head2 METHODS
 
 =head3 init
@@ -343,6 +348,22 @@ sub init_webkit {
         $self->load_status($load_event);
     });
 
+    $self->view->signal_connect('decide-policy' => sub {
+        my ($view, $decision, $type) = @_;
+        if ($type eq 'navigation-action') {
+            my $action = $decision->get_navigation_action;
+            die "Already running a navigation action to " .
+                $self->active_navigation_action
+                . " when requested "
+                . $action->get_navigation_type . ' ' . $action->get_request->get_uri
+                if $self->active_navigation_action and not $action->is_redirect;
+            $self->active_navigation_action($action->get_request->get_uri)
+                if ($self->view->get_uri =~ s/#.*//r) ne ($action->get_request->get_uri =~ s/#.*//r);
+        }
+        $decision->use;
+        return 0;
+    });
+
     $self->enable_file_access_from_file_urls;
     $self->enable_hardware_acceleration;
 
@@ -389,7 +410,7 @@ sub process_events {
 sub process_page_load {
     my ($self) = @_;
 
-    Gtk3::main_iteration_do(0) while Gtk3::events_pending or $self->is_loading;
+    Gtk3::main_iteration_do(0) while Gtk3::events_pending or $self->is_loading or $self->active_navigation_action;
 }
 
 sub is_loading {
@@ -409,14 +430,17 @@ sub handle_form_submission {
 sub handle_resource_request {
     my ($self, $view, $resource, $request) = @_;
 
+    my $uri = $request->get_uri;
     $self->pending_requests->{"$request"}++;
 
     $resource->signal_connect('finished' => sub {
+        $self->active_navigation_action('') if $uri eq $self->active_navigation_action;
         delete $self->pending_requests->{"$request"};
     });
     $resource->signal_connect('failed' => sub {
         # If someone decides not to wait_for_pending_requests, this signal is received
         # during global destruction with $self being undefined.
+        $self->active_navigation_action('') if $uri eq $self->active_navigation_action;
         delete $self->pending_requests->{"$request"} if defined $self;
     });
 }

lib/WWW/WebKit2/Events.pm

@@ -176,7 +176,7 @@ sub wait_for_async_page_load {
     $variable_name //= "webkit2_to_reload";
 
     $self->wait_for_condition(sub {
-        not $self->run_javascript("window.$variable_name;");
+        not $self->run_javascript("return window.$variable_name;");
     }, $timeout);
     $self->wait_for_page_to_load;
 }

lib/WWW/WebKit2/Inspector.pm

@@ -14,7 +14,7 @@ sub run_javascript {
     my $done = 0;
     my $js_result = '';
 
-    $self->view->run_javascript($javascript_string, undef, sub {
+    $self->view->run_javascript("(function () {$javascript_string})()", undef, sub {
         my ($object, $result, $user_data) = @_;
         $done = 1;
         $js_result = $self->get_javascript_result($result, $raw, $javascript_string);
@@ -84,7 +84,7 @@ sub resolve_locator {
 sub get_title {
     my ($self) = @_;
 
-    my $value = $self->run_javascript('document.title');
+    my $value = $self->run_javascript('return document.title');
 
     return $value;
 }
@@ -259,7 +259,7 @@ sub is_ordered {
         $second_element->prepare_element .
         'var second_element = element;' .
         'var position = first_element.compareDocumentPosition(second_element);' .
-        '(position == 4) ? 1 : 0';
+        'return (position == 4) ? 1 : 0';
 
     return decode_json $self->run_javascript($javascript_string);
 }

lib/WWW/WebKit2/Locator.pm

@@ -290,7 +290,7 @@ sub get_screen_position {
         var win_left = window.screenLeft ? window.screenLeft : window.screenX;
         var win_top = window.screenTop ? window.screenTop : window.screenY;
         var result = { "y": win_top + y, "x": win_left + x };
-        JSON.stringify(result)';
+        return JSON.stringify(result)';
 
     my $result = decode_json $self->inspector->run_javascript($search);
     return ($result->{x}, $result->{y});
@@ -338,11 +338,11 @@ sub fire_event {
         }, { once: true });
         var event = new Event("' . $event_type . '", { "bubbles": true, "cancelable": true });
         element.dispatchEvent(event);
-    ';
+        ';
 
     my $result = $self->inspector->run_javascript($fire_event);
     $self->inspector->wait_for_condition(sub {
-        my $event_fired = $self->inspector->run_javascript("window.event_fired");
+        my $event_fired = $self->inspector->run_javascript("return window.event_fired");
         # event_fired will be undef if the event triggered a page load
         return 1 if (not $event_fired or $event_fired eq "fired");
         return 0;
@@ -369,7 +369,7 @@ sub is_visible {
 
     $search .= "
         $is_visible_function
-        isVisible(element)
+        return isVisible(element)
     ";
 
     return $self->inspector->run_javascript($search);
@@ -455,7 +455,7 @@ sub prepare_element {
         var $element_name = getElementsByXPath('$locator'$parent_param);
     ";
 
-    my $count = $self->inspector->run_javascript($search . "$element_name.length;");
+    my $count = $self->inspector->run_javascript($search . "return $element_name.length;");
     croak "xpath: $locator gave $count results" if $count != 1;
 
     $search .= "$element_name = $element_name" . "[0];";
@@ -471,7 +471,7 @@ sub prepare_element_search {
     my ($self, $function) = @_;
 
     my $search = $self->prepare_element;
-    $search .= "element.$function;";
+    $search .= "return element.$function;";
 
     return $search;
 }
@@ -501,7 +501,7 @@ sub prepare_elements_search {
     my ($self, $function) = @_;
 
     my $search = $self->prepare_elements;
-    $search .= "elements.$function;";
+    $search .= "return elements.$function;";
 
     return $search;
 }

lib/WWW/WebKit2/MouseInput.pm

@@ -28,21 +28,33 @@ sub select {
     my $set_select =
         $select->prepare_element .
         'var options = element.options;
+        var found = 0;
         for (var i = 0; i < options.length; i++) {
-            if (options[i].value === ' . "'$option_value'" . ' ) {
+            if (options[i].value === ' . "'$option_value'" . qq/ ) {
+                element.selectedIndex = i;
                 options[i].selected = true;
+                found = 1;
                 break;
             }
         }
-    ';
+        if (!found)
+            throw 'Did not find value "$option_value" for select $select';
+        window.event_fired = "initialized";
+        element.addEventListener("change", function(e) {
+           window.event_fired = "fired";
+        }, { once: true });
+        var event = new Event("change", { "bubbles": true, "cancelable": true });
+        element.dispatchEvent(event);
+    /;
 
     $self->run_javascript($set_select);
-
     $self->wait_for_condition(sub {
-        return $select->get_value eq $option_value;
+        my $event_fired = $self->run_javascript("return window.event_fired");
+        # event_fired will be undef if the event triggered a page load
+        return 1 if (not $event_fired or $event_fired eq "fired");
+        return 0;
     });
 
-    $select->fire_event('change');
 
     $self->process_page_load;
 
@@ -228,7 +240,7 @@ sub fire_mouse_event {
             $shift_down
         );
 
-        element.dispatchEvent(clickEvent);";
+        return element.dispatchEvent(clickEvent);";
 
     $self->run_javascript($mouse_up_script);
 
@@ -317,7 +329,7 @@ sub native_drag_and_drop_to_object {
         $source_element
         $target_element
         DndSimulator.simulate(source, target);
-        1;
+        return 1;
     };
 
     $self->run_javascript($js_string);

t/01load.t

@@ -61,8 +61,8 @@ ok($sel->is_ordered('id=first', 'id=second'), 'is_ordered is correct for ordered
 ok((not $sel->is_ordered('id=second', 'id=first')), 'is_ordered detects wrong order correctly');
 
 $sel->open("$Bin/test/eval.html");
-is($sel->eval_js('"foo"'), 'foo', 'string evaluated');
-is($sel->eval_js('document.getElementById("foo").firstChild.data'), 'bar', 'js evaluated');
+is($sel->eval_js('return "foo"'), 'foo', 'string evaluated');
+is($sel->eval_js('return document.getElementById("foo").firstChild.data'), 'bar', 'js evaluated');
 
 $sel->refresh;
 $sel->open("$Bin/test/type.html");

t/events.t

@@ -46,7 +46,7 @@ ok(
 $webkit->eval_js("window.scrollBy(0, 100);");
 ok(
     $webkit->wait_for_condition(sub {
-        $webkit->eval_js("document.documentElement.scrollTop") == 100
+        $webkit->eval_js("return document.documentElement.scrollTop") == 100
     }, 1000)
 );
 
@@ -84,9 +84,9 @@ is($webkit->resolve_locator("css=#ajax_result")->get_inner_html, 'Hello World',
 $webkit->prepare_async_page_load;
 $webkit->click('css=button#start_ajax_with_reload');
 $webkit->wait_for_async_page_load;
-ok((not $webkit->run_javascript('window.ajax_url')), 'page has been reloaded');
+ok((not $webkit->run_javascript('return window.ajax_url')), 'page has been reloaded');
 
-is($webkit->run_javascript('document.cookie'), 'foo=bar', 'cookie set');
+is($webkit->run_javascript('return document.cookie'), 'foo=bar', 'cookie set');
 $webkit->clear_cookies;
 is($webkit->run_javascript('document.cookie'), '', 'cookies cleared');
 

t/inspector.t

@@ -33,12 +33,12 @@ ok(1, 'opened');
 eval {
     $webkit->eval_js(<<"JS");
        var foo = function() {};
-       foo.bar = function() {};
+       retun foo.bar = function() {};
 JS
 };
 like $@, qr/Unexpected return value/, 'eval_js dies with more useful error message';
 
-my $js = $webkit->run_javascript('document.title');
+my $js = $webkit->run_javascript('return document.title');
 is($js, 'test', 'document.title is test');
 
 my $html_source = $webkit->get_html_source();
@@ -55,7 +55,7 @@ is($text, "Testlink", "get_text works");
 
 my $evaluated_js = $webkit->eval_js(
     'document.body.style.height = "400px";
-    document.body.offsetHeight'
+    return document.body.offsetHeight'
 );
 ok($evaluated_js == 400, "we can calculated with returned value");
 is($evaluated_js, 400, "eval_js works");

t/navigator.t

@@ -37,6 +37,6 @@ $webkit->go_back;
 $webkit->open("file://$Bin/test/type.html");
 $webkit->submit('css=form');
 is($webkit->view->get_uri, "file://$Bin/test/type.html?foo=foo");
-is($webkit->run_javascript('window.location.href'), "file://$Bin/test/type.html?foo=foo");
+is($webkit->run_javascript('return window.location.href'), "file://$Bin/test/type.html?foo=foo");
 
 done_testing;