From 3442348a0ae5e28e283f381dcbefc05302603a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 18 Aug 2019 11:28:49 +0200 Subject: Simplify it --- spec/cache/git_spec.rb | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb index 588ff2e37b..1cb278e912 100644 --- a/spec/cache/git_spec.rb +++ b/spec/cache/git_spec.rb @@ -221,22 +221,20 @@ end expect(gemspec).to_not match("`echo bob`") end - unless cmd == "package" || Bundler.feature_flag.cache_command_is_package? - it "can install after #{cmd} with git not installed" do - build_git "foo" - - gemfile <<-G - gem "foo", :git => '#{lib_path("foo-1.0")}' - G - bundle! "config set cache_all true" - bundle! cmd, "all-platforms" => true, :install => false, :path => "./vendor/cache" - - simulate_new_machine - with_path_as "" do - bundle! "config set deployment true" - bundle! :install, :local => true - expect(the_bundle).to include_gem "foo 1.0" - end + it "can install after #{cmd} with git not installed" do + build_git "foo" + + gemfile <<-G + gem "foo", :git => '#{lib_path("foo-1.0")}' + G + bundle! "config set cache_all true" + bundle! cmd, "all-platforms" => true, :install => false, :path => "./vendor/cache" + + simulate_new_machine + with_path_as "" do + bundle! "config set deployment true" + bundle! :install, :local => true + expect(the_bundle).to include_gem "foo 1.0" end end end -- cgit v1.2.1