Merge pull request #13671 from arunagw/upgrade-bundler

Removing without_thor_debug 

1 files changed, 3 insertions, 13 deletions

diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb
index 8e9028a3fb..7576eba6e0 100644
--- a/railties/lib/rails/generators/testing/behaviour.rb
+++ b/railties/lib/rails/generators/testing/behaviour.rb
@@ -61,11 +61,9 @@ module Rails
         # You can provide a configuration hash as second argument. This method returns the output
         # printed by the generator.
         def run_generator(args=self.default_arguments, config={})
-          without_thor_debug do
-            capture(:stdout) do
-              args += ['--skip-bundle'] unless args.include? '--dev'
-              self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
-            end
+          capture(:stdout) do
+            args += ['--skip-bundle'] unless args.include? '--dev'
+            self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
           end
         end
 
@@ -102,14 +100,6 @@ module Rails
             dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
-
-          # TODO: remove this once Bundler 1.5.2 is released
-          def without_thor_debug # :nodoc:
-            thor_debug, ENV['THOR_DEBUG'] = ENV['THOR_DEBUG'], nil
-            yield
-          ensure
-            ENV['THOR_DEBUG'] = thor_debug
-          end
       end
     end
   end