summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-05-16 19:47:24 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-05-22 20:32:30 +0900
commit26367367ec384c7c64d7293a5dc7296932b88692 (patch)
tree2b69223cef3f52092e8529173cfaab303e8ceecd
parent9c2752296d526a127aab69216ab31b2cab3fb7a1 (diff)
Marked the failing examples with the current master branch on ruby repository
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3114
-rw-r--r--spec/bundler/commands/clean_spec.rb6
-rw-r--r--spec/bundler/commands/exec_spec.rb18
-rw-r--r--spec/bundler/commands/info_spec.rb2
-rw-r--r--spec/bundler/commands/newgem_spec.rb2
-rw-r--r--spec/bundler/commands/pristine_spec.rb2
-rw-r--r--spec/bundler/install/deploy_spec.rb2
-rw-r--r--spec/bundler/install/gemfile/git_spec.rb2
-rw-r--r--spec/bundler/install/gems/native_extensions_spec.rb2
-rw-r--r--spec/bundler/install/gems/standalone_spec.rb2
-rw-r--r--spec/bundler/install/global_cache_spec.rb2
-rw-r--r--spec/bundler/install/path_spec.rb2
-rw-r--r--spec/bundler/other/platform_spec.rb8
-rw-r--r--spec/bundler/runtime/setup_spec.rb4
-rw-r--r--spec/bundler/runtime/with_unbundled_env_spec.rb4
14 files changed, 29 insertions, 29 deletions
diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
index b808e0085c..0c69585c0b 100644
--- a/spec/bundler/commands/clean_spec.rb
+++ b/spec/bundler/commands/clean_spec.rb
@@ -765,7 +765,7 @@ RSpec.describe "bundle clean" do
should_not_have_gems "foo-1.0"
end
- it "doesn't remove extensions artifacts from bundled git gems after clean" do
+ it "doesn't remove extensions artifacts from bundled git gems after clean", :ruby_repo do
build_git "very_simple_git_binary", &:add_c_extension
revision = revision_for(lib_path("very_simple_git_binary-1.0"))
@@ -788,7 +788,7 @@ RSpec.describe "bundle clean" do
expect(vendored_gems("bundler/gems/very_simple_git_binary-1.0-#{revision[0..11]}")).to exist
end
- it "removes extension directories" do
+ it "removes extension directories", :ruby_repo do
gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
@@ -824,7 +824,7 @@ RSpec.describe "bundle clean" do
expect(simple_binary_extensions_dir).to exist
end
- it "removes git extension directories" do
+ it "removes git extension directories", :ruby_repo do
build_git "very_simple_git_binary", &:add_c_extension
revision = revision_for(lib_path("very_simple_git_binary-1.0"))
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index 08ebfe5ead..773ee5fab5 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe "bundle exec" do
system_gems(system_gems_to_install, :path => default_bundle_path)
end
- it "works with --gemfile flag" do
+ it "works with --gemfile flag", :ruby_repo do
create_file "CustomGemfile", <<-G
gem "rack", "1.0.0"
G
@@ -15,7 +15,7 @@ RSpec.describe "bundle exec" do
expect(out).to eq("1.0.0")
end
- it "activates the correct gem" do
+ it "activates the correct gem", :ruby_repo do
gemfile <<-G
gem "rack", "0.9.1"
G
@@ -24,7 +24,7 @@ RSpec.describe "bundle exec" do
expect(out).to eq("0.9.1")
end
- it "works when the bins are in ~/.bundle" do
+ it "works when the bins are in ~/.bundle", :ruby_repo do
install_gemfile <<-G
gem "rack"
G
@@ -33,7 +33,7 @@ RSpec.describe "bundle exec" do
expect(out).to eq("1.0.0")
end
- it "works when running from a random directory" do
+ it "works when running from a random directory", :ruby_repo do
install_gemfile <<-G
gem "rack"
G
@@ -269,7 +269,7 @@ RSpec.describe "bundle exec" do
)
end
- it "handles gems installed with --without" do
+ it "handles gems installed with --without", :ruby_repo do
install_gemfile <<-G, forgotten_command_line_options(:without => "middleware")
source "#{file_uri_for(gem_repo1)}"
gem "rack" # rack 0.9.1 and 1.0 exist
@@ -353,7 +353,7 @@ RSpec.describe "bundle exec" do
expect(err).to include("bundler: exec needs a command to run")
end
- it "raises a helpful error when exec'ing to something outside of the bundle" do
+ it "raises a helpful error when exec'ing to something outside of the bundle", :ruby_repo do
bundle! "config set clean false" # want to keep the rackup binstub
install_gemfile! <<-G
source "#{file_uri_for(gem_repo1)}"
@@ -457,7 +457,7 @@ RSpec.describe "bundle exec" do
end
describe "with gem executables" do
- describe "run from a random directory" do
+ describe "run from a random directory", :ruby_repo do
before(:each) do
install_gemfile <<-G
gem "rack"
@@ -587,7 +587,7 @@ RSpec.describe "bundle exec" do
end
describe "with gems bundled for deployment" do
- it "works when calling bundler from another script" do
+ it "works when calling bundler from another script", :ruby_repo do
skip "https://github.com/rubygems/bundler/issues/6898" if Gem.win_platform?
gemfile <<-G
@@ -873,7 +873,7 @@ __FILE__: #{path.to_s.inspect}
bundle! :install
end
- it "correctly shells out" do
+ it "correctly shells out", :ruby_repo do
skip "https://github.com/rubygems/bundler/issues/6898" if Gem.win_platform?
file = bundled_app("file_that_bundle_execs.rb")
diff --git a/spec/bundler/commands/info_spec.rb b/spec/bundler/commands/info_spec.rb
index 53158c9168..df2d5f2824 100644
--- a/spec/bundler/commands/info_spec.rb
+++ b/spec/bundler/commands/info_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe "bundle info" do
expect(err).to eq("Could not find gem 'missing'.")
end
- context "given a default gem shippped in ruby" do
+ context "given a default gem shippped in ruby", :ruby_repo do
it "prints information about the default gem" do
bundle! "info rdoc"
expect(out).to include("* rdoc")
diff --git a/spec/bundler/commands/newgem_spec.rb b/spec/bundler/commands/newgem_spec.rb
index 62ffaedcc0..1dc51de9e7 100644
--- a/spec/bundler/commands/newgem_spec.rb
+++ b/spec/bundler/commands/newgem_spec.rb
@@ -246,7 +246,7 @@ RSpec.describe "bundle gem" do
end
end
- it "generates a valid gemspec", :readline do
+ it "generates a valid gemspec", :readline, :ruby_repo do
bundle! "gem newgem --bin"
prepare_gemspec(bundled_app("newgem", "newgem.gemspec"))
diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb
index 9729d55cdc..d572cd2c01 100644
--- a/spec/bundler/commands/pristine_spec.rb
+++ b/spec/bundler/commands/pristine_spec.rb
@@ -2,7 +2,7 @@
require "bundler/vendored_fileutils"
-RSpec.describe "bundle pristine" do
+RSpec.describe "bundle pristine", :ruby_repo do
before :each do
build_lib "baz", :path => bundled_app do |s|
s.version = "1.0.0"
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb
index 071c6fcfcc..9563d32e7e 100644
--- a/spec/bundler/install/deploy_spec.rb
+++ b/spec/bundler/install/deploy_spec.rb
@@ -63,7 +63,7 @@ RSpec.describe "install with --deployment or --frozen" do
bundle! :install, forgotten_command_line_options(:deployment => true, :without => "test")
end
- it "works when you bundle exec bundle" do
+ it "works when you bundle exec bundle", :ruby_repo do
skip "doesn't find bundle" if Gem.win_platform?
bundle! :install
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index 6cfab1b89c..fd5cde4fb1 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -1139,7 +1139,7 @@ RSpec.describe "bundle install with git sources" do
expect(out).to include(Pathname.glob(default_bundle_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
end
- it "does not use old extension after ref changes" do
+ it "does not use old extension after ref changes", :ruby_repo do
git_reader = build_git "foo", :no_default => true do |s|
s.extensions = ["ext/extconf.rb"]
s.write "ext/extconf.rb", <<-RUBY
diff --git a/spec/bundler/install/gems/native_extensions_spec.rb b/spec/bundler/install/gems/native_extensions_spec.rb
index dba0607bb4..a057d0d152 100644
--- a/spec/bundler/install/gems/native_extensions_spec.rb
+++ b/spec/bundler/install/gems/native_extensions_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "installing a gem with native extensions" do
+RSpec.describe "installing a gem with native extensions", :ruby_repo do
it "installs" do
build_repo2 do
build_gem "c_extension" do |s|
diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb
index 2490227e13..6e4074fb9f 100644
--- a/spec/bundler/install/gems/standalone_spec.rb
+++ b/spec/bundler/install/gems/standalone_spec.rb
@@ -68,7 +68,7 @@ RSpec.shared_examples "bundle install --standalone" do
include_examples "common functionality"
end
- describe "with gems with native extension" do
+ describe "with gems with native extension", :ruby_repo do
before do
install_gemfile <<-G, forgotten_command_line_options(:path => bundled_app("bundle")).merge(:standalone => true, :dir => cwd)
source "#{file_uri_for(gem_repo1)}"
diff --git a/spec/bundler/install/global_cache_spec.rb b/spec/bundler/install/global_cache_spec.rb
index d93e158ed5..575996718e 100644
--- a/spec/bundler/install/global_cache_spec.rb
+++ b/spec/bundler/install/global_cache_spec.rb
@@ -186,7 +186,7 @@ RSpec.describe "global gem caching" do
end
describe "extension caching" do
- it "works" do
+ it "works", :ruby_repo do
skip "gets incorrect ref in path" if Gem.win_platform?
build_git "very_simple_git_binary", &:add_c_extension
diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb
index 3176258565..bed28ed3e2 100644
--- a/spec/bundler/install/path_spec.rb
+++ b/spec/bundler/install/path_spec.rb
@@ -162,7 +162,7 @@ RSpec.describe "bundle install" do
expect(the_bundle).to include_gems "rack 1.0.0"
end
- it "re-installs gems whose extensions have been deleted" do
+ it "re-installs gems whose extensions have been deleted", :ruby_repo do
build_lib "very_simple_binary", "1.0.0", :to_system => true do |s|
s.write "lib/very_simple_binary.rb", "raise 'FAIL'"
end
diff --git a/spec/bundler/other/platform_spec.rb b/spec/bundler/other/platform_spec.rb
index 565706c30c..4831adc7f9 100644
--- a/spec/bundler/other/platform_spec.rb
+++ b/spec/bundler/other/platform_spec.rb
@@ -829,7 +829,7 @@ G
system_gems "rack-1.0.0", "rack-0.9.1", :path => default_bundle_path
end
- it "activates the correct gem when ruby version matches" do
+ it "activates the correct gem when ruby version matches", :ruby_repo do
gemfile <<-G
gem "rack", "0.9.1"
@@ -852,7 +852,7 @@ G
expect(out).to include("0.9.1")
end
- it "fails when the ruby version doesn't match" do
+ it "fails when the ruby version doesn't match", :ruby_repo do
gemfile <<-G
gem "rack", "0.9.1"
@@ -863,7 +863,7 @@ G
should_be_ruby_version_incorrect
end
- it "fails when the engine doesn't match" do
+ it "fails when the engine doesn't match", :ruby_repo do
gemfile <<-G
gem "rack", "0.9.1"
@@ -885,7 +885,7 @@ G
# should_be_engine_version_incorrect
# end
- it "fails when patchlevel doesn't match" do
+ it "fails when patchlevel doesn't match", :ruby_repo do
gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
gem "rack"
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index 2aa0585bac..5975218c48 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -112,7 +112,7 @@ RSpec.describe "Bundler.setup" do
lp.map! {|p| p.sub(/^#{Regexp.union system_gem_path.to_s, default_bundle_path.to_s, lib_dir.to_s}/i, "") }
end
- it "puts loaded gems after -I and RUBYLIB" do
+ it "puts loaded gems after -I and RUBYLIB", :ruby_repo do
install_gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
gem "rack"
@@ -755,7 +755,7 @@ end
expect(out).to eq("yay")
end
- it "should clean $LOAD_PATH properly" do
+ it "should clean $LOAD_PATH properly", :ruby_repo do
gem_name = "very_simple_binary"
full_gem_name = gem_name + "-1.0"
ext_dir = File.join(tmp("extensions", full_gem_name))
diff --git a/spec/bundler/runtime/with_unbundled_env_spec.rb b/spec/bundler/runtime/with_unbundled_env_spec.rb
index 2baa785285..4525321010 100644
--- a/spec/bundler/runtime/with_unbundled_env_spec.rb
+++ b/spec/bundler/runtime/with_unbundled_env_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe "Bundler.with_env helpers" do
end
end
- it "works with nested bundle exec invocations" do
+ it "works with nested bundle exec invocations", :ruby_repo do
create_file("exe.rb", <<-'RUBY')
count = ARGV.first.to_i
exit if count < 0
@@ -95,7 +95,7 @@ RSpec.describe "Bundler.with_env helpers" do
expect(last_command.stdboth).not_to include("-rbundler/setup")
end
- it "should restore RUBYLIB" do
+ it "should restore RUBYLIB", :ruby_repo do
create_file("source.rb", <<-RUBY)
print #{modified_env}['RUBYLIB']
RUBY