Merged r15252 from trunk to 3.1-stable

NameError: uninitialized constant Redmine::ApiTest::GroupsTest::MultiJson

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15279 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index 56323dcf6f55621ea97cf42217dcff85d09caef4..a9c40f536d277c323a6651ecb3418212fddb1a1a 100644 (file)
--- a/test/integration/api_test/groups_test.rb
+++ b/test/integration/api_test/groups_test.rb
@@ -67,7 +67,7 @@ class Redmine::ApiTest::GroupsTest < Redmine::ApiTest::Base
     assert_response :success
     assert_equal 'application/json', response.content_type
 
-    json = MultiJson.load(response.body)
+    json = ActiveSupport::JSON.decode(response.body)
     groups = json['groups']
     assert_kind_of Array, groups
     group = groups.detect {|g| g['name'] == 'A Team'}