Merge pull request #7887 from rubygems/deivid-rodriguez/smoother-devenv-breaking-changes

Allow smoother breaking changes in test env

(cherry picked from commit bac8744)

Author: deivid-rodriguez

bundler/spec/support/path.rb

@@ -102,7 +102,18 @@ def man_tracked_files
     end
 
     def tmp(*path)
-      source_root.join("tmp", scope, *path)
+      tmp_root(scope).join(*path)
+    end
+
+    def tmp_root(scope)
+      source_root.join("tmp", "#{test_env_version}.#{scope}")
+    end
+
+    # Bump this version whenever you make a breaking change to the spec setup
+    # that requires regenerating tmp/.
+
+    def test_env_version
+      1
     end
 
     def scope

bundler/spec/support/rubygems_ext.rb

@@ -57,8 +57,8 @@ def install_parallel_test_deps
       install_test_deps
 
       (2..Parallel.processor_count).each do |n|
-        source = Path.source_root.join("tmp", "1")
-        destination = Path.source_root.join("tmp", n.to_s)
+        source = Path.tmp_root("1")
+        destination = Path.tmp_root(n.to_s)
 
         FileUtils.rm_rf destination
         FileUtils.cp_r source, destination