Merge pull request #10965 from piwik/3.x-dev3.0.0-b5

Release Piwik 3.0.0-beta5

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/API/tests/Unit/JsonRendererTest.php b/plugins/API/tests/Unit/JsonRendererTest.php
index ea7f5d69d4..d71d7068ef 100644
--- a/plugins/API/tests/Unit/JsonRendererTest.php
+++ b/plugins/API/tests/Unit/JsonRendererTest.php
@@ -356,14 +356,14 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase
         $this->assertNoJsonError($actual);
     }
 
-    public function test_json_renderArray_ShouldConvertSingleDimensionalAssociativeArray()
+    public function test_oldJson_renderArray_ShouldConvertSingleDimensionalAssociativeArray()
     {
         $input = array(
             "firstElement" => "isFirst",
             "secondElement" => "isSecond"
         );
 
-        $expected = '{"firstElement":"isFirst","secondElement":"isSecond"}';
+        $expected = '[{"firstElement":"isFirst","secondElement":"isSecond"}]';
 
         $oldJsonBuilder = new Json($input);
         $actual = $oldJsonBuilder->renderArray($input);
@@ -373,7 +373,7 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase
 
     private function makeBuilder($request)
     {
-        return new Json($request);
+        return new Json2($request);
     }
 
     private function assertNoJsonError($response)