diff options
Diffstat (limited to 'spec')
38 files changed, 0 insertions, 67 deletions
diff --git a/spec/bundler/bundler_spec.rb b/spec/bundler/bundler_spec.rb index fa226002cc..5f3515da00 100644 --- a/spec/bundler/bundler_spec.rb +++ b/spec/bundler/bundler_spec.rb @@ -68,6 +68,5 @@ describe Bundler do $VERBOSE = verbose end end - end end diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb index f5bffee779..182df4ea7c 100644 --- a/spec/bundler/dsl_spec.rb +++ b/spec/bundler/dsl_spec.rb @@ -187,5 +187,4 @@ describe Bundler::Dsl do to raise_error(Bundler::GemfileError, /There was an error parsing `Gemfile`: can't modify frozen String. Bundler cannot continue./i) end end - end diff --git a/spec/bundler/source/rubygems_spec.rb b/spec/bundler/source/rubygems_spec.rb index 6bcde3d328..68fc6c6ed4 100644 --- a/spec/bundler/source/rubygems_spec.rb +++ b/spec/bundler/source/rubygems_spec.rb @@ -22,5 +22,4 @@ describe Bundler::Source::Rubygems do end end end - end diff --git a/spec/bundler/source_list_spec.rb b/spec/bundler/source_list_spec.rb index f5a8575ae8..2ce41832ca 100644 --- a/spec/bundler/source_list_spec.rb +++ b/spec/bundler/source_list_spec.rb @@ -344,5 +344,4 @@ describe Bundler::SourceList do source_list.remote! end end - end diff --git a/spec/cache/gems_spec.rb b/spec/cache/gems_spec.rb index b70f62743a..dd7d9c0e5f 100644 --- a/spec/cache/gems_spec.rb +++ b/spec/cache/gems_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle cache" do - describe "when there are only gemsources" do before :each do gemfile <<-G @@ -211,7 +210,6 @@ describe "bundle cache" do expect(cached_gem("activesupport-2.3.2")).to exist end - it "doesn't remove gems that are for another platform" do simulate_platform "java" do install_gemfile <<-G @@ -280,5 +278,4 @@ describe "bundle cache" do should_be_installed "foo-bundler 1.0" end end - end diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb index b369504dcb..45061e6ea9 100644 --- a/spec/cache/git_spec.rb +++ b/spec/cache/git_spec.rb @@ -183,6 +183,5 @@ end gemspec = bundled_app("vendor/cache/foo-1.0-#{ref}/foo.gemspec").read expect(gemspec).to_not match("`echo bob`") end - end end diff --git a/spec/commands/check_spec.rb b/spec/commands/check_spec.rb index afc2cef6d9..6cd2160641 100644 --- a/spec/commands/check_spec.rb +++ b/spec/commands/check_spec.rb @@ -344,5 +344,4 @@ describe "bundle check" do end end end - end diff --git a/spec/commands/install_spec.rb b/spec/commands/install_spec.rb index 0f05588c4d..ec5df3dad3 100644 --- a/spec/commands/install_spec.rb +++ b/spec/commands/install_spec.rb @@ -374,5 +374,4 @@ describe "bundle install with gem sources" do expect(out).to_not include("Your Gemfile has no gem server sources") end end - end diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index e627c7d504..a35c7ffcf7 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle gem" do - def reset! super global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false" @@ -677,7 +676,6 @@ describe "bundle gem" do it "asks about CoC" do global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false" - bundle "gem foobar" do |input| input.puts "yes" end @@ -685,5 +683,4 @@ describe "bundle gem" do expect(bundled_app("foobar/CODE_OF_CONDUCT.md")).to exist end end - end diff --git a/spec/install/binstubs_spec.rb b/spec/install/binstubs_spec.rb index 9a76c52974..e35611696c 100644 --- a/spec/install/binstubs_spec.rb +++ b/spec/install/binstubs_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe "bundle install" do - describe "when system_bindir is set" do # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if # you want to avoid sudo installs for system gems with OS X's default ruby @@ -20,5 +19,4 @@ describe "bundle install" do expect(system_gem_path("altbin/rackup")).to exist end end - end diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb index 516581b7f3..71bb1c165f 100644 --- a/spec/install/bundler_spec.rb +++ b/spec/install/bundler_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe "bundle install" do - describe "with bundler dependencies" do before(:each) do build_repo2 do @@ -57,7 +56,6 @@ describe "bundle install" do gem "multiple_versioned_deps" G - install_gemfile <<-G source "file://#{gem_repo2}" @@ -142,5 +140,4 @@ describe "bundle install" do expect(out).to include("The Gemfile's dependencies are satisfied") end end - end diff --git a/spec/install/force_spec.rb b/spec/install/force_spec.rb index 737c11d923..344694ed8e 100644 --- a/spec/install/force_spec.rb +++ b/spec/install/force_spec.rb @@ -31,6 +31,5 @@ describe "bundle install" do expect(out).to include "Installing rack 1.0.0" should_be_installed "rack 1.0.0" end - end end diff --git a/spec/install/gemfile/gemspec_spec.rb b/spec/install/gemfile/gemspec_spec.rb index 7746e459d5..d0d982a438 100644 --- a/spec/install/gemfile/gemspec_spec.rb +++ b/spec/install/gemfile/gemspec_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle install from an existing gemspec" do - before(:each) do build_gem "bar", :to_system => true build_gem "bar-dev", :to_system => true @@ -166,5 +165,4 @@ describe "bundle install from an existing gemspec" do should_be_installed "rack 1.0" end end - end diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb index eae7452b3f..708f6f787e 100644 --- a/spec/install/gemfile/git_spec.rb +++ b/spec/install/gemfile/git_spec.rb @@ -112,7 +112,6 @@ describe "bundle install with git sources" do should_be_installed "foo 1.1", "rack 1.0" end - end describe "with an empty git block" do diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb index b07038136f..a6a5c1991a 100644 --- a/spec/install/gemfile/path_spec.rb +++ b/spec/install/gemfile/path_spec.rb @@ -538,5 +538,4 @@ describe "bundle install with explicit source paths" do expect(out).to include("failed for foo-1.0") end end - end diff --git a/spec/install/gemfile_spec.rb b/spec/install/gemfile_spec.rb index bfe239396a..e9a7de349d 100644 --- a/spec/install/gemfile_spec.rb +++ b/spec/install/gemfile_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle install" do - context "with duplicated gems" do it "will display a warning" do install_gemfile <<-G @@ -66,5 +65,4 @@ describe "bundle install" do expect(out).to match(/You passed :lib as an option for gem 'rack', but it is invalid/) end end - end diff --git a/spec/install/gems/dependency_api_spec.rb b/spec/install/gems/dependency_api_spec.rb index 7f20039e62..40cf8ada35 100644 --- a/spec/install/gems/dependency_api_spec.rb +++ b/spec/install/gems/dependency_api_spec.rb @@ -665,5 +665,4 @@ describe "gemcutter's dependency API" do expect(exitstatus).to eq(0) if exitstatus end end - end diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index 6b93b9db05..43cc1776d8 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -316,5 +316,4 @@ describe "bundle flex_install" do # out.should match(/Gemfile.lock/) # end # end - end diff --git a/spec/install/gems/groups_spec.rb b/spec/install/gems/groups_spec.rb index 5d0972d158..7490858526 100644 --- a/spec/install/gems/groups_spec.rb +++ b/spec/install/gems/groups_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle install with groups" do - describe "installing with no options" do before :each do install_gemfile <<-G @@ -308,7 +307,6 @@ describe "bundle install with groups" do bundle "install --without emo" should_be_installed "rack 1.0.0", "activesupport 2.3.5" end - end end @@ -337,7 +335,6 @@ describe "bundle install with groups" do end end - describe "when locked and installed with --without" do before(:each) do build_repo2 @@ -370,5 +367,4 @@ describe "bundle install with groups" do expect(err).to be_empty end end - end diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb index ef8aecf1ab..7bc4de971f 100644 --- a/spec/install/gems/resolving_spec.rb +++ b/spec/install/gems/resolving_spec.rb @@ -99,7 +99,6 @@ describe "bundle install with gem sources" do expect(resolve_output).to include(" net_b (>= 0) ruby") end end - end describe "when some gems require a different version of ruby" do diff --git a/spec/install/gems/sources_spec.rb b/spec/install/gems/sources_spec.rb index 731f1402e5..4d88c9f8c2 100644 --- a/spec/install/gems/sources_spec.rb +++ b/spec/install/gems/sources_spec.rb @@ -412,5 +412,4 @@ describe "bundle install with gems on multiple sources" do should_be_installed("bar 0.1") end end - end diff --git a/spec/install/gems/sudo_spec.rb b/spec/install/gems/sudo_spec.rb index 3e833960e2..48bb813577 100644 --- a/spec/install/gems/sudo_spec.rb +++ b/spec/install/gems/sudo_spec.rb @@ -49,7 +49,6 @@ describe "when using sudo", :sudo => true do expect(system_gem_path("gems/another_implicit_rake_dep-1.0")).to exist end - it "installs when BUNDLE_PATH is owned by root" do bundle_path = tmp("owned_by_root") FileUtils.mkdir_p bundle_path @@ -150,5 +149,4 @@ describe "when using sudo", :sudo => true do expect(out).to include("Don't run Bundler as root.") end end - end diff --git a/spec/install/gemspecs_spec.rb b/spec/install/gemspecs_spec.rb index 201ba9564a..524c1651c0 100644 --- a/spec/install/gemspecs_spec.rb +++ b/spec/install/gemspecs_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe "bundle install" do - describe "when a gem has a YAML gemspec" do before :each do build_repo2 do @@ -46,5 +45,4 @@ describe "bundle install" do bundle :install, :artifice => 'endpoint_marshal_fail' # force gemspec load should_be_installed "activesupport 2.3.2" end - end diff --git a/spec/install/parallel/spec_installation_spec.rb b/spec/install/parallel/spec_installation_spec.rb index 8cb6ea8a49..407b176a90 100644 --- a/spec/install/parallel/spec_installation_spec.rb +++ b/spec/install/parallel/spec_installation_spec.rb @@ -2,7 +2,6 @@ require 'spec_helper' require 'bundler/installer/parallel_installer' describe ParallelInstaller::SpecInstallation do - let!(:dep) do a_spec = Object.new def a_spec.name @@ -59,5 +58,4 @@ describe ParallelInstaller::SpecInstallation do end end end - end diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb index 6c5e7e50ab..e350a44d17 100644 --- a/spec/install/path_spec.rb +++ b/spec/install/path_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "bundle install" do - describe "with --path" do before :each do build_gem "rack", "1.0.0", :to_system => true do |s| @@ -146,5 +145,4 @@ describe "bundle install" do expect(out).to match(/invalid symlink/) end end - end diff --git a/spec/install/prereleases_spec.rb b/spec/install/prereleases_spec.rb index f4f79af47a..202b1650e5 100644 --- a/spec/install/prereleases_spec.rb +++ b/spec/install/prereleases_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe "bundle install" do - describe "when prerelease gems are available" do it "finds prereleases" do install_gemfile <<-G @@ -39,5 +38,4 @@ describe "bundle install" do should_be_installed "rack 1.0" end end - end diff --git a/spec/install/security_policy_spec.rb b/spec/install/security_policy_spec.rb index 1f48cb9e5a..09e9507336 100644 --- a/spec/install/security_policy_spec.rb +++ b/spec/install/security_policy_spec.rb @@ -41,7 +41,6 @@ describe "policies with unsigned gems" do bundle "install" expect(exitstatus).to eq(0) if exitstatus end - end describe "policies with signed gems and no CA" do diff --git a/spec/install/upgrade_spec.rb b/spec/install/upgrade_spec.rb index 603c39bf11..a855e44331 100644 --- a/spec/install/upgrade_spec.rb +++ b/spec/install/upgrade_spec.rb @@ -22,5 +22,4 @@ describe "bundle install for the first time with v1.0" do bundle :install expect(bundled_app.join(".bundle/environment.rb")).not_to exist end - end diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb index 5af98e99c2..c901957e86 100644 --- a/spec/lock/lockfile_spec.rb +++ b/spec/lock/lockfile_spec.rb @@ -4,7 +4,6 @@ describe "the lockfile format" do include Bundler::GemHelpers it "generates a simple lockfile for a single source, gem" do - install_gemfile <<-G source "file://#{gem_repo1}" @@ -115,7 +114,6 @@ describe "the lockfile format" do end it "updates the lockfile's bundler version if not present" do - lockfile <<-L GEM remote: file:#{gem_repo1}/ @@ -1092,7 +1090,6 @@ describe "the lockfile format" do expect(out).to include "rack (= 1.0) and rack (= 1.1)" end - it "raises if two different sources are used" do install_gemfile <<-G source "file://#{gem_repo1}" @@ -1125,7 +1122,6 @@ describe "the lockfile format" do BUNDLED WITH #{Bundler::VERSION} G - end # Some versions of the Bundler 1.1 RC series introduced corrupted @@ -1210,7 +1206,6 @@ describe "the lockfile format" do File.utime(time, time, bundled_app('Gemfile.lock')) end before(:each) do - build_repo2 install_gemfile <<-G @@ -1226,7 +1221,6 @@ describe "the lockfile format" do end context "during updates" do - it "preserves Gemfile.lock \\n line endings" do update_repo2 @@ -1248,7 +1242,6 @@ describe "the lockfile format" do end context "when nothing changes" do - it "preserves Gemfile.lock \\n line endings" do expect { ruby <<-RUBY require 'rubygems' diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb index 5b1748fbaa..998bce6064 100644 --- a/spec/resolver/basic_spec.rb +++ b/spec/resolver/basic_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "Resolving" do - before :each do @index = an_awesome_index end @@ -75,5 +74,4 @@ describe "Resolving" do dep "foo", ">= 3.0.0" should_resolve_and_include %w(foo-3.0.5) end - end diff --git a/spec/resolver/platform_spec.rb b/spec/resolver/platform_spec.rb index 149bc921fc..47756008fe 100644 --- a/spec/resolver/platform_spec.rb +++ b/spec/resolver/platform_spec.rb @@ -29,7 +29,6 @@ describe "Resolving platform craziness" do end describe "with mingw32" do - before :each do @index = build_index do platforms "mingw32 mswin32 x64-mingw32" do |platform| diff --git a/spec/runtime/load_spec.rb b/spec/runtime/load_spec.rb index 358e3021e8..de4bd926e1 100644 --- a/spec/runtime/load_spec.rb +++ b/spec/runtime/load_spec.rb @@ -79,7 +79,6 @@ describe "Bundler.load" do bundler_gemfile.rmtree if @remove_bundler_gemfile end end - end describe "when called twice" do @@ -119,5 +118,4 @@ describe "Bundler.load" do end end end - end diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb index a253d4e86e..6a36e6bd4e 100644 --- a/spec/runtime/setup_spec.rb +++ b/spec/runtime/setup_spec.rb @@ -954,5 +954,4 @@ describe "Bundler.setup" do end end end - end diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb index 193a6e5b0c..d00e2c701f 100644 --- a/spec/runtime/with_clean_env_spec.rb +++ b/spec/runtime/with_clean_env_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" describe "Bundler.with_env helpers" do - shared_examples_for "Bundler.with_*_env" do it "should reset and restore the environment" do gem_path = ENV['GEM_PATH'] @@ -22,7 +21,6 @@ describe "Bundler.with_env helpers" do end describe "Bundler.with_clean_env" do - it_should_behave_like "Bundler.with_*_env" it "should keep the original GEM_PATH even in sub processes" do @@ -58,11 +56,9 @@ describe "Bundler.with_env helpers" do it "should not change ORIGINAL_ENV" do expect(Bundler::ORIGINAL_ENV['BUNDLE_PATH']).to eq('./Gemfile') end - end describe "Bundler.with_original_env" do - it_should_behave_like "Bundler.with_*_env" it "should pass bundler environment variables set before Bundler was run" do diff --git a/spec/support/artifice/endpoint.rb b/spec/support/artifice/endpoint.rb index adff4a7bcd..59e80bb8f2 100644 --- a/spec/support/artifice/endpoint.rb +++ b/spec/support/artifice/endpoint.rb @@ -12,7 +12,6 @@ require 'artifice' require 'sinatra/base' class Endpoint < Sinatra::Base - helpers do def dependencies_for(gem_names, gem_repo = gem_repo1) return [] if gem_names.nil? || gem_names.empty? diff --git a/spec/support/builders.rb b/spec/support/builders.rb index 02e4a2a955..a76cbc21a5 100644 --- a/spec/support/builders.rb +++ b/spec/support/builders.rb @@ -614,11 +614,9 @@ module Spec Dir.chdir(@path) { `git #{cmd}`.strip } end end - end class GemBuilder < LibBuilder - def _build(opts) lib_path = super(opts.merge(:path => @context.tmp(".tmp/#{@spec.full_name}"), :no_default => opts[:no_default])) Dir.chdir(lib_path) do diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb index 5b98bf458e..436d4bbb7c 100644 --- a/spec/support/indexes.rb +++ b/spec/support/indexes.rb @@ -208,7 +208,6 @@ module Spec # Issue #3459 def a_complicated_index build_index do - gem "foo", %w{3.0.0 3.0.5} do dep "qux", ["~> 3.1"] dep "baz", ["< 9.0", ">= 5.0"] diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb index 9f5e71b3e2..bc122e2907 100644 --- a/spec/update/git_spec.rb +++ b/spec/update/git_spec.rb @@ -94,7 +94,6 @@ describe "bundle update" do expect(out).to include("Bundle complete!") end - it "fetches tags from the remote" do build_git "foo" @remote = build_git("bar", :bare => true) |