Item13897: Made JsonrpcTests working.

- Fixed a bug where JsonRpcContrib::Server was resetting web/topic despite they're been handled by Request::JSON now. - Trigger wasn't called for Foswiki::Request::method attribute in build code. - Fixed JsonRpc code being treated as a string by JSON::encode() sometimes.
foswiki · Oct 31, 2016 · 43b778c · 43b778c
1 parent 2ecbed8
commit 43b778c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Response.pm b/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Response.pm
@@ -22,10 +22,8 @@ use Assert;
 use Compress::Zlib ();
 use JSON           ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class qw(app);
 extends qw(Foswiki::Object);
-with qw(Foswiki::AppObject);
 
 use constant TRACE => 0;    # toggle me
 
@@ -107,7 +105,7 @@ sub encode {
         $message = {
             jsonrpc => "2.0",
             error   => {
-                code    => $code,
+                code => $code + 0,  # Sometimes code comes as a string, not int.
                 message => $message,
             },
         };

diff --git a/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Server.pm b/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Server.pm
@@ -82,16 +82,20 @@ sub dispatch {
         return;
     }
 
+    # ---------- OBSOLETE BEGIN ----------
+    # XXX This code is obsolete since the request object is handling this logic
+    # now and provides valid defined web.topic for the application.
     # get topic parameter and set the location overriding any
     #  other value derived from the namespace param
-    my $topic = $request->param('topic')
-      || $Foswiki::cfg{HomeTopicName};
-    my ( $jsrpcWeb, $jsrpcTopic ) =
-      Foswiki::Func::normalizeWebTopicName( $Foswiki::cfg{UsersWebName},
-        $topic );
-    $app->request->web($jsrpcWeb);
-    $app->request->topic($jsrpcTopic);
-    $this->writeDebug("topic=$topic") if TRACE;
+    #my $topic = $request->param('topic')
+    #  || $Foswiki::cfg{HomeTopicName};
+    #my ( $jsrpcWeb, $jsrpcTopic ) =
+    #  Foswiki::Func::normalizeWebTopicName( $Foswiki::cfg{UsersWebName},
+    #    $topic );
+    #$app->request->web($jsrpcWeb);
+    #$app->request->topic($jsrpcTopic);
+    #$this->writeDebug("topic=$topic") if TRACE;
+    # ---------- OBSOLETE END ---------
 
     # get handler for this namespace
     my $handler = $this->getHandler($request);

diff --git a/JsonRpcContrib/lib/Foswiki/Request/JSON.pm b/JsonRpcContrib/lib/Foswiki/Request/JSON.pm
@@ -412,11 +412,11 @@ around _trigger_method => sub {
     my $this    = shift;
     my ($value) = @_;
 
-    if ( defined $value && $this->_has_jsondata && lc($value) ne 'post' ) {
+    if ( defined $value && $this->has_jsondata && lc($value) ne 'post' ) {
         $this->jsonerror(
             new Foswiki::Contrib::JsonRpcContrib::Error(
                 code => -32600,
-                text => "Method must be POST, not " . $value
+                text => "Method must be POST, not " . uc($value)
             )
         );
     }

diff --git a/JsonRpcContrib/test/unit/JsonRpcContrib/JsonrpcTests.pm b/JsonRpcContrib/test/unit/JsonRpcContrib/JsonrpcTests.pm
@@ -11,8 +11,7 @@ use Foswiki::EngineException();
 use Carp();
 use Try::Tiny;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw( FoswikiFnTestCase );
 
 use Unit::Request::JSON;
@@ -294,7 +293,7 @@ sub test_post_required {
     };
 
     $this->assert_matches( qr/"code" : -32600/,                   $response );
-    $this->assert_matches( qr/"message" : "Method must be POST"/, $response );
+    $this->assert_matches( qr/"message" : "Method must be POST,/, $response );
 
     return;
 }

diff --git a/core/lib/Foswiki/Request.pm b/core/lib/Foswiki/Request.pm
@@ -1268,8 +1268,13 @@ sub _establishTopic {
 }
 
 sub _establishMethod {
-    my $this = shift;
-    return $this->app->engine->connectionData->{method};
+    my $this   = shift;
+    my $method = $this->app->engine->connectionData->{method};
+
+    # Call it manually because triggers are not called for default/build.
+    $this->_trigger_method($method);
+
+    return $method;
 }
 
 sub _establishUploads {