diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 06:38:05 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 06:38:05 +0000 |
commit | fb3ff98f802de717c518bf0e500a4eebf2e4cbb2 (patch) | |
tree | 0b9668d0ed7db7fe40648f062fcd35dac23c2b75 /test/integration | |
parent | dd1adc345e96dade7b20684388a0dfe2f610abfe (diff) | |
download | redmine-fb3ff98f802de717c518bf0e500a4eebf2e4cbb2.tar.gz redmine-fb3ff98f802de717c518bf0e500a4eebf2e4cbb2.zip |
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
Diffstat (limited to 'test/integration')
-rw-r--r-- | test/integration/api_test/groups_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb index 0221fd27f..c9f79f242 100644 --- 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'} |