Disallow folder changing helpers without a block

Since their naming leads to code that reads a bit weird without a block.

2 files changed, 9 insertions, 7 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0a49b46aaa..a4e99a6dd8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -105,7 +105,9 @@ RSpec.configure do |config|
     ENV.replace(original_env)
     reset!
     system_gems []
-    in_app_root
+
+    Dir.chdir(bundled_app)
+
     @command_executions = []
 
     Bundler.ui.silence { example.run }
diff --git a/spec/support/path.rb b/spec/support/path.rb
index 9596724cc0..0c80fe5551 100644
--- a/spec/support/path.rb
+++ b/spec/support/path.rb
@@ -180,16 +180,16 @@ module Spec
       end
     end
 
-    def in_app_root(&blk)
-      Dir.chdir(bundled_app, &blk)
+    def in_app_root
+      Dir.chdir(bundled_app) { yield }
     end
 
-    def in_app_root2(&blk)
-      Dir.chdir(bundled_app2, &blk)
+    def in_app_root2
+      Dir.chdir(bundled_app2) { yield }
     end
 
-    def in_repo_root(&blk)
-      Dir.chdir(root, &blk)
+    def in_repo_root
+      Dir.chdir(root) { yield }
     end
 
     extend self