Item13897: Enable more JSON tests.

Fix one bug - URL method was overriding the JSON posted method. One test fails - need to confirm on master. json redirectto parameter appears to be encoded. Anchor # is encoded as %23.
foswiki · Nov 1, 2016 · dbdb98a · dbdb98a
1 parent 260a67e
commit dbdb98a
Show file tree

Hide file tree

Showing 2 changed files with 246 additions and 87 deletions.
diff --git a/JsonRpcContrib/lib/Foswiki/Request/JSON.pm b/JsonRpcContrib/lib/Foswiki/Request/JSON.pm
@@ -449,7 +449,7 @@ sub _establishNamespace {
         $this->jsonerror(
             new Foswiki::Contrib::JsonRpcContrib::Error(
                 code => -32600,
-                text => "Invalid Namespace / method FOO"
+                text => "Invalid Namespace / method"
             )
         );
         return;
@@ -458,7 +458,8 @@ sub _establishNamespace {
     my $namespace = $1;
     my $method    = $2;
 
-    if ( defined $method ) {
+    # Don't set the method if it has already been established by POSTDATA
+    if ( defined $method && !$this->jsonmethod ) {
         $this->jsonmethod($method);
     }