Merged r15252 from trunk to 3.2-stable

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

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

diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index 0221fd27f26aaa75c5cc1ff96c8ad1e0f67de0f4..c9f79f242db3f20f2457a08e1293ec84e1ec04b7 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'}