Fix test harness support for sprockets-rails 3

2 files changed, 10 insertions, 8 deletions

diff --git a/Rakefile b/Rakefile
index 8952b26..18ea009 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,13 +18,15 @@ task :test_all_gemfiles do
     env = {'BUNDLE_GEMFILE' => gemfile}
     cmd_with_env = "  (#{env.map { |k, v| "export #{k}=#{Shellwords.escape v}" } * ' '}; #{cmd})"
     $stderr.puts Term::ANSIColor.cyan("Testing\n#{cmd_with_env}")
-    PTY.spawn(env, cmd) do |r, _w, pid|
-      begin
-        r.each_line { |l| puts l }
-      rescue Errno::EIO
-        # Errno:EIO error means that the process has finished giving output.
-      ensure
-        ::Process.wait pid
+    Bundler.with_clean_env do
+      PTY.spawn(env, cmd) do |r, _w, pid|
+        begin
+          r.each_line { |l| puts l }
+        rescue Errno::EIO
+          # Errno:EIO error means that the process has finished giving output.
+        ensure
+          ::Process.wait pid
+        end
       end
     end
     [$? && $?.exitstatus == 0, cmd_with_env]
diff --git a/test/support/dummy_rails_integration.rb b/test/support/dummy_rails_integration.rb
index 82e975f..9dbc254 100644
--- a/test/support/dummy_rails_integration.rb
+++ b/test/support/dummy_rails_integration.rb
@@ -24,6 +24,6 @@ module DummyRailsIntegration
   private
   def cleanup_dummy_rails_files
     FileUtils.rm_rf('test/dummy_rails/tmp/cache', secure: true)
-    FileUtils.rm Dir.glob('test/dummy_rails/public/assets/*')
+    FileUtils.rm Dir.glob('test/dummy_rails/public/assets/{.[^\.]*,*}')
   end
 end