summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2016-12-21 17:46:18 +0000
committerThe Bundler Bot <bot@bundler.io>2016-12-21 17:46:18 +0000
commit148816f865c323bbb170d61c211f09c99ca3cbce (patch)
tree8822aceba6ef4bd4085d8fe08d697a30e7de6753
parent9eefcbece2378b2c355e58f2a5a208d4ab0e8315 (diff)
parent38f731224e1e082a6bb88721f2e1abb8682361f2 (diff)
downloadbundler-148816f865c323bbb170d61c211f09c99ca3cbce.tar.gz
Auto merge of #5261 - bundler:seg-specs-2.4-fix, r=segiddins
Fix the specs on Ruby 2.4
-rw-r--r--spec/install/gemfile_spec.rb2
-rw-r--r--spec/runtime/inline_spec.rb8
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/install/gemfile_spec.rb b/spec/install/gemfile_spec.rb
index 03ae344987..f6602c0560 100644
--- a/spec/install/gemfile_spec.rb
+++ b/spec/install/gemfile_spec.rb
@@ -72,7 +72,7 @@ describe "bundle install" do
simulate_ruby_version "2.3.0" do
simulate_ruby_engine "jruby", "9.1.2.0" do
install_gemfile! <<-G
- source "https://rubygems.org"
+ source "file://#{gem_repo1}"
ruby "2.3.0", :engine => :jruby, :engine_version => "9.1.2.0"
G
diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb
index 3b08e50e64..15f3723693 100644
--- a/spec/runtime/inline_spec.rb
+++ b/spec/runtime/inline_spec.rb
@@ -85,12 +85,14 @@ describe "bundler/inline#gemfile" do
script <<-RUBY, :artifice => "endpoint"
gemfile(true) do
- source "https://rubygems.org"
+ source "https://notaserver.com"
gem "activesupport", :require => true
end
RUBY
expect(out).to include("Installing activesupport")
+ err.gsub! %r{.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$}, ""
+ err.strip!
expect(err).to lack_errors
expect(exitstatus).to be_zero if exitstatus
end
@@ -104,7 +106,7 @@ describe "bundler/inline#gemfile" do
end
end
gemfile(true, :ui => MyBundlerUI.new) do
- source "https://rubygems.org"
+ source "https://notaserver.com"
gem "activesupport", :require => true
end
RUBY
@@ -196,7 +198,7 @@ describe "bundler/inline#gemfile" do
it "installs inline gems when a Gemfile.lock is present" do
gemfile <<-G
- source "https://rubygems.org"
+ source "https://notaserver.com"
gem "rake"
G