diff options
author | Andre Arko <andre@arko.net> | 2016-10-13 19:40:39 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2016-10-13 19:40:39 -0700 |
commit | f084b9043fd631f469f9fffde9be70ee067bccb1 (patch) | |
tree | 5c8d71957a3a9dcf31a298b8188339704be199f5 /spec | |
parent | bc746cbd8d13df66425f661371115ae092dcaff7 (diff) | |
parent | a7834e47e420b4fb1c41a5a8e7adec1a2fa03481 (diff) | |
download | bundler-f084b9043fd631f469f9fffde9be70ee067bccb1.tar.gz |
Merge tag 'v1.13.4'
Version 1.13.4
Diffstat (limited to 'spec')
-rw-r--r-- | spec/realworld/dependency_api_spec.rb | 1 | ||||
-rw-r--r-- | spec/realworld/edgecases_spec.rb | 34 | ||||
-rw-r--r-- | spec/realworld/gemfile_source_header_spec.rb | 1 | ||||
-rw-r--r-- | spec/realworld/mirror_probe_spec.rb | 1 | ||||
-rw-r--r-- | spec/runtime/with_clean_env_spec.rb | 4 |
5 files changed, 25 insertions, 16 deletions
diff --git a/spec/realworld/dependency_api_spec.rb b/spec/realworld/dependency_api_spec.rb index 9823cf8c..ea02adfe 100644 --- a/spec/realworld/dependency_api_spec.rb +++ b/spec/realworld/dependency_api_spec.rb @@ -26,6 +26,7 @@ describe "gemcutter's dependency API", :realworld => true do end after do + Artifice.deactivate @t.kill @t.join end diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb index 06e58804..81fe3d77 100644 --- a/spec/realworld/edgecases_spec.rb +++ b/spec/realworld/edgecases_spec.rb @@ -2,6 +2,20 @@ require "spec_helper" describe "real world edgecases", :realworld => true, :sometimes => true do + def rubygems_version(name, requirement) + require "bundler/source/rubygems/remote" + require "bundler/fetcher" + source = Bundler::Source::Rubygems::Remote.new(URI("https://rubygems.org")) + fetcher = Bundler::Fetcher.new(source) + index = fetcher.specs([name], nil) + rubygem = index.search(Gem::Dependency.new(name, requirement)).last + if rubygem.nil? + raise "Could not find #{name} (#{requirement}) on rubygems.org!\n" \ + "Found specs:\n#{index.send(:specs).inspect}" + end + "#{name} (#{rubygem.version})" + end + # there is no rbx-relative-require gem that will install on 1.9 it "ignores extra gems with bad platforms", :ruby => "~> 1.8.7" do gemfile <<-G @@ -15,7 +29,7 @@ describe "real world edgecases", :realworld => true, :sometimes => true do # https://github.com/bundler/bundler/issues/1202 it "bundle cache works with rubygems 1.3.7 and pre gems", - :ruby => "~> 1.8.7", "https://rubygems.org" => "~> 1.3.7" do + :ruby => "~> 1.8.7", :rubygems => "~> 1.3.7" do install_gemfile <<-G source "https://rubygems.org" gem "rack", "1.3.0.beta2" @@ -32,8 +46,8 @@ describe "real world edgecases", :realworld => true, :sometimes => true do source "https://rubygems.org" gem 'i18n', '~> 0.6.0' - gem 'activesupport', '~> 3.0' - gem 'activerecord', '~> 3.0' + gem 'activesupport', '~> 3.0.5' + gem 'activerecord', '~> 3.0.5' gem 'builder', '~> 2.1.2' G bundle :lock @@ -49,15 +63,7 @@ describe "real world edgecases", :realworld => true, :sometimes => true do gem 'rack-cache', '1.2.0' # last version that works on Ruby 1.9 G bundle! :lock - rails_version = ruby(<<-R) - require 'rubygems' - require 'bundler' - fetcher = Bundler::Fetcher.new(Bundler::Source::Rubygems::Remote.new(URI('https://rubygems.org'))) - index = fetcher.specs(%w(rails), nil) - rails = index.search(Gem::Dependency.new("rails", "~> 3.0")).last - puts rails.version - R - expect(lockfile).to include("rails (#{rails_version})") + expect(lockfile).to include(rubygems_version("rails", "~> 3.0")) expect(lockfile).to include("capybara (2.2.1)") end @@ -84,8 +90,8 @@ describe "real world edgecases", :realworld => true, :sometimes => true do gem "builder", "~> 2.1.2" G bundle :lock - expect(lockfile).to include("i18n (0.6.11)") - expect(lockfile).to include("activesupport (3.0.5)") + expect(lockfile).to include(rubygems_version("i18n", "~> 0.6.0")) + expect(lockfile).to include(rubygems_version("activesupport", "~> 3.0")) end # https://github.com/bundler/bundler/issues/1500 diff --git a/spec/realworld/gemfile_source_header_spec.rb b/spec/realworld/gemfile_source_header_spec.rb index 1c39fe97..95935f76 100644 --- a/spec/realworld/gemfile_source_header_spec.rb +++ b/spec/realworld/gemfile_source_header_spec.rb @@ -12,6 +12,7 @@ describe "fetching dependencies with a mirrored source", :realworld => true, :ru end after do + Artifice.deactivate @t.kill @t.join end diff --git a/spec/realworld/mirror_probe_spec.rb b/spec/realworld/mirror_probe_spec.rb index bb2be7f2..0fb93b8a 100644 --- a/spec/realworld/mirror_probe_spec.rb +++ b/spec/realworld/mirror_probe_spec.rb @@ -15,6 +15,7 @@ describe "fetching dependencies with a not available mirror", :realworld => true end after do + Artifice.deactivate @server_thread.kill @server_thread.join end diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb index 752754be..294233a5 100644 --- a/spec/runtime/with_clean_env_spec.rb +++ b/spec/runtime/with_clean_env_spec.rb @@ -116,14 +116,14 @@ describe "Bundler.with_env helpers" do end end - describe "Bundler.clean_system" do + describe "Bundler.clean_system", :ruby => ">= 1.9" do it "runs system inside with_clean_env" do Bundler.clean_system(%(echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh)) expect($?.exitstatus).to eq(42) end end - describe "Bundler.clean_exec" do + describe "Bundler.clean_exec", :ruby => ">= 1.9" do it "runs exec inside with_clean_env" do pid = Kernel.fork do Bundler.clean_exec(%(echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh)) |