From 94bd30512ecf5cf65809b837c63850d28ad04e27 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo.manacorda@gmail.com>
Date: Fri, 18 Sep 2015 19:08:21 +0200
Subject: remove `disable_shared_gems` from specs

---
 spec/commands/config_spec.rb    | 26 ++++++++++----------------
 spec/install/path_spec.rb       | 12 +++---------
 spec/runtime/executable_spec.rb |  6 ++----
 spec/runtime/setup_spec.rb      |  5 +----
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/spec/commands/config_spec.rb b/spec/commands/config_spec.rb
index a9adde3711..4a1fc7a23d 100644
--- a/spec/commands/config_spec.rb
+++ b/spec/commands/config_spec.rb
@@ -11,15 +11,12 @@ describe ".bundle/config" do
   describe "BUNDLE_APP_CONFIG" do
     it "can be moved with an environment variable" do
       ENV["BUNDLE_APP_CONFIG"] = tmp("foo/bar").to_s
-      bundle "config path vendor/bundle"
-      bundle "install"
+      bundle "config --local foo bar"
+      bundle :install
 
-      # See CLI::Install#run.
-      with_config(:disable_shared_gems => "1") do
-        expect(bundled_app(".bundle")).not_to exist
-        expect(tmp("foo/bar/config")).to exist
-        should_be_installed "rack 1.0.0"
-      end
+      expect(bundled_app(".bundle")).not_to exist
+      expect(tmp("foo/bar/config")).to exist
+      should_be_installed "rack 1.0.0"
     end
 
     it "can provide a relative path with the environment variable" do
@@ -27,15 +24,12 @@ describe ".bundle/config" do
       Dir.chdir bundled_app("omg")
 
       ENV["BUNDLE_APP_CONFIG"] = "../foo"
-      bundle "config path vendor/bundle"
-      bundle "install"
+      bundle "config --local foo bar"
+      bundle :install
 
-      # See CLI::Install#run.
-      with_config(:disable_shared_gems => "1") do
-        expect(bundled_app(".bundle")).not_to exist
-        expect(bundled_app("../foo/config")).to exist
-        should_be_installed "rack 1.0.0"
-      end
+      expect(bundled_app(".bundle")).not_to exist
+      expect(bundled_app("../foo/config")).to exist
+      should_be_installed "rack 1.0.0"
     end
 
     it "removes environment.rb from BUNDLE_APP_CONFIG's path" do
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 69f93a6f5e..8fb2a0b9d8 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -17,10 +17,7 @@ describe "bundle install" do
       bundle "config path vendor/bundle"
       bundle "install"
 
-      # See CLI::Install#run.
-      with_config(:disable_shared_gems => "1") do
-        should_be_installed "rack 1.0.0"
-      end
+      should_be_installed "rack 1.0.0"
     end
 
     it "handles paths with regex characters in them" do
@@ -54,11 +51,8 @@ describe "bundle install" do
       FileUtils.rm_rf bundled_app("vendor")
       bundle "install"
 
-      # See CLI::Install#run.
-      with_config(:disable_shared_gems => "1") do
-        expect(vendored_gems("gems/rack-1.0.0")).to be_directory
-        should_be_installed "rack 1.0.0"
-      end
+      expect(vendored_gems("gems/rack-1.0.0")).to be_directory
+      should_be_installed "rack 1.0.0"
     end
   end
 
diff --git a/spec/runtime/executable_spec.rb b/spec/runtime/executable_spec.rb
index ff249b1964..202e7620d7 100644
--- a/spec/runtime/executable_spec.rb
+++ b/spec/runtime/executable_spec.rb
@@ -160,11 +160,9 @@ describe "Running bin/* commands" do
       file.print "OMG"
     end
 
-    # See CLI::Binstubs#run.
     bundle "config bin bin/"
     bundle "install"
-    with_config(:disable_shared_gems => "1") do
-      expect(bundled_app("bin/rackup").read).to_not eq("OMG")
-    end
+
+    expect(bundled_app("bin/rackup").read).to_not eq("OMG")
   end
 end
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 55e5613883..1283555ea5 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -210,10 +210,7 @@ describe "Bundler.setup" do
       s.write "lib/rack.rb", "RACK = 'FAIL'"
     end
 
-    # See CLI::Install#run.
-    with_config(:disable_shared_gems => "1") do
-      should_be_installed "rack 1.0.0"
-    end
+    should_be_installed "rack 1.0.0"
   end
 
   describe "integrate with rubygems" do
-- 
cgit v1.2.1