diff options
author | Bundlerbot <bot@bundler.io> | 2019-08-23 07:26:38 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-08-23 07:26:38 +0000 |
commit | 31414dd7768d6492b5174a349cbf0ab5c12c9989 (patch) | |
tree | 9fa29596eeeb0c2545bb0544a3a5ce4fedef8988 /spec/bundler | |
parent | 3e6afa55fc064ba1397a780dd863c3f2e85df63e (diff) | |
parent | ade9d38d4c4487de838198a7980753cbacc1fef3 (diff) | |
download | bundler-31414dd7768d6492b5174a349cbf0ab5c12c9989.tar.gz |
Merge #7324
7324: Remove `:ruby_core` tag for ruby core r=hsbt a=hsbt
This pull request is backported from https://github.com/ruby/ruby/pull/2380
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'spec/bundler')
-rw-r--r-- | spec/bundler/cli_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/env_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/gem_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/mirror_spec.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/spec/bundler/cli_spec.rb b/spec/bundler/cli_spec.rb index 79b0cdb737..02e5155733 100644 --- a/spec/bundler/cli_spec.rb +++ b/spec/bundler/cli_spec.rb @@ -15,7 +15,7 @@ RSpec.describe "bundle executable" do it "looks for a binary and executes it if it's named bundler-<task>" do File.open(tmp("bundler-testtasks"), "w", 0o755) do |f| - ruby = ENV["BUNDLE_RUBY"] || "/usr/bin/env ruby" + ruby = ENV["RUBY"] || "/usr/bin/env ruby" f.puts "#!#{ruby}\nputs 'Hello, world'\n" end diff --git a/spec/bundler/env_spec.rb b/spec/bundler/env_spec.rb index 4b9efd85d6..f0ab5d5f35 100644 --- a/spec/bundler/env_spec.rb +++ b/spec/bundler/env_spec.rb @@ -190,11 +190,11 @@ RSpec.describe Bundler::Env do end end - describe ".version_of", :ruby_repo do + describe ".version_of" do let(:parsed_version) { described_class.send(:version_of, "ruby") } it "strips version of new line characters" do - expect(parsed_version).to_not include("\n") + expect(parsed_version).to_not end_with("\n") end end end diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb index a21fd4c835..c01d65d5dd 100644 --- a/spec/bundler/gem_helper_spec.rb +++ b/spec/bundler/gem_helper_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Bundler::GemHelper do end end - context "gem management", :ruby_repo do + context "gem management" do def mock_confirm_message(message) expect(Bundler.ui).to receive(:confirm).with(message) end diff --git a/spec/bundler/mirror_spec.rb b/spec/bundler/mirror_spec.rb index fb476b8465..76b697c4d2 100644 --- a/spec/bundler/mirror_spec.rb +++ b/spec/bundler/mirror_spec.rb @@ -304,7 +304,7 @@ RSpec.describe Bundler::Settings::TCPSocketProbe do server.close unless server.closed? end - it "probes the server correctly", :ruby_repo do + it "probes the server correctly" do with_server_and_mirror do |server, mirror| expect(server.closed?).to be_falsey expect(probe.replies?(mirror)).to be_truthy |