aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 08:36:37 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 08:36:37 +0000
commit2e4f0af00f85ca228bcf5fa919882359411c652a (patch)
tree6317ef3d0c352a8d7496139f34277e224fe3d4ac /test/rubygems
parent7b14512bee222bdb6392e865b00ef4b4c42b9364 (diff)
downloadruby-2e4f0af00f85ca228bcf5fa919882359411c652a.tar.gz
* ext/json/*, test/json/*: Reverted r50231. Because it's not works with
cross-compile environment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r--test/rubygems/test_gem_commands_install_command.rb2
-rw-r--r--test/rubygems/test_gem_commands_update_command.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index c165479e76..f03285ae85 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -379,7 +379,7 @@ ERROR: Possible alternatives: non_existent_with_hint
wait_for_child_process_to_exit
assert_path_exists File.join(a2.doc_dir, 'ri')
- assert_path_exists File.join(a2.doc_dir, 'rdoc') if defined?(JSON)
+ assert_path_exists File.join(a2.doc_dir, 'rdoc')
end
def test_execute_saves_build_args
diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb
index 4387eea20b..6a327068e2 100644
--- a/test/rubygems/test_gem_commands_update_command.rb
+++ b/test/rubygems/test_gem_commands_update_command.rb
@@ -265,7 +265,7 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
a2 = @specs['a-2']
assert_path_exists File.join(a2.doc_dir, 'rdoc')
- end if defined?(JSON)
+ end
def test_execute_named
spec_fetcher do |fetcher|
@@ -540,3 +540,4 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
end
end
+