Limit warning to `bundle i` and `bundle install`

Reorganize specs

Remove whitespace

1 files changed, 16 insertions, 15 deletions

diff --git a/spec/other/trampoline_spec.rb b/spec/other/trampoline_spec.rb
index 54be4314dd..8f73050eae 100644
--- a/spec/other/trampoline_spec.rb
+++ b/spec/other/trampoline_spec.rb
@@ -7,21 +7,6 @@ describe "bundler version trampolining" do
     FileUtils.rm_rf(system_gem_path)
     FileUtils.cp_r(base_system_gems, system_gem_path)
   end
-  context "warnings" do
-    it "warns user if Bundler is outdated and is < 1.13.0.pre.1" do
-      ENV["BUNDLER_VERSION"] = "1.12.0"
-      bundle! "--version"
-      expect(out).to include(<<-WARN.strip)
-You're running Bundler #{Bundler::VERSION} but this project uses #{ENV["BUNDLER_VERSION"]}. To update, run `bundle update --bundler`.\n
-      WARN
-
-      ENV["BUNDLER_VERSION"] = "1.13.0.pre.1"
-      bundle! "--version"
-      expect(out).not_to include(<<-WARN.strip)
-You're running Bundler #{Bundler::VERSION} but this project uses #{ENV["BUNDLER_VERSION"]}. To update, run `bundle update --bundler`.\n
-      WARN
-    end
-  end
 
   context "version guessing" do
     shared_examples_for "guesses" do |version|
@@ -149,4 +134,20 @@ The error was:
       expect(out).to eq("1.12.0")
     end
   end
+
+  context "warnings" do
+    before do
+      simulate_bundler_version("1.12.0") do
+        install_gemfile ""
+      end
+    end
+
+    it "warns user if Bundler is outdated and is < 1.13.0.pre.1" do
+      ENV["BUNDLER_VERSION"] = "1.12.0"
+      bundle! "install"
+      expect(out).to include(<<-WARN.strip)
+You're running Bundler #{Bundler::VERSION} but this project uses #{ENV["BUNDLER_VERSION"]}. To update, run `bundle update --bundler`.\n
+      WARN
+    end
+  end
 end