diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 06:38:52 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-03-24 06:38:52 +0000 |
| commit | 99e89089051e37f69b8accfea57f65638c44b08b (patch) | |
| tree | a114ec11ca17ed74968c4d53fe706f94301eb131 | |
| parent | 59e9564c6959cef21efb3a67d03d75861013e08e (diff) | |
| download | redmine-99e89089051e37f69b8accfea57f65638c44b08b.tar.gz redmine-99e89089051e37f69b8accfea57f65638c44b08b.zip | |
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
| -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 56323dcf6..a9c40f536 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'} |