diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
commit | 3dc6efbe9ca582d6930f25754a16043dedecfa6f (patch) | |
tree | 35980c7383e9e12d092e0eff78f5f16eca2fa1fc /test/rubygems/test_gem_request_set_gem_dependency_api.rb | |
parent | 59a6215af65b3bfade13836681cbacc3294e6e78 (diff) |
Merge rubygems master targeted RubyGems 3.1.0.
https://github.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_request_set_gem_dependency_api.rb')
-rw-r--r-- | test/rubygems/test_gem_request_set_gem_dependency_api.rb | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index 320fdcb604..0e597f2b11 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -652,20 +652,23 @@ end end def test_platform_mswin - util_set_arch 'i686-darwin8.10.1' do - @gda.platform :mswin do - @gda.gem 'a' + if win_platform? + util_set_arch 'x86-mswin32-60' do + @gda.platform :mswin do + @gda.gem 'a' + end + + assert_equal [dep('a')], @set.dependencies + refute_empty @set.dependencies end + else + util_set_arch 'i686-darwin8.10.1' do + @gda.platform :mswin do + @gda.gem 'a' + end - assert_empty @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platform :mswin do - @gda.gem 'a' + assert_empty @set.dependencies end - - refute_empty @set.dependencies end end @@ -708,26 +711,20 @@ end end def test_platforms - util_set_arch 'i686-darwin8.10.1' do - @gda.platforms :ruby do - @gda.gem 'a' - end + unless win_platform? + util_set_arch 'i686-darwin8.10.1' do + @gda.platforms :ruby do + @gda.gem 'a' + end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep('a')], @set.dependencies - @gda.platforms :mswin do - @gda.gem 'b' - end + @gda.platforms :mswin do + @gda.gem 'b' + end - assert_equal [dep('a')], @set.dependencies - end - - util_set_arch 'x86-mswin32-60' do - @gda.platforms :mswin do - @gda.gem 'c' + assert_equal [dep('a')], @set.dependencies end - - assert_equal [dep('a'), dep('c')], @set.dependencies end end |