diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-03 06:38:52 -0700 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-03 06:38:52 -0700 |
commit | a957cb7f378e1c1b6b21e862fed095c6e72745ac (patch) | |
tree | c55cc28b6b76f67408a4e61f1a88e864ae3e22c7 /railties/lib/rails/generators/testing/behaviour.rb | |
parent | 5120e5596c7e5cb58004cb264e93a4670ee0e8f6 (diff) | |
parent | cfb37a899d915fbfc63b36e7b1627c5c63cfa622 (diff) | |
download | rails-a957cb7f378e1c1b6b21e862fed095c6e72745ac.tar.gz rails-a957cb7f378e1c1b6b21e862fed095c6e72745ac.tar.bz2 rails-a957cb7f378e1c1b6b21e862fed095c6e72745ac.zip |
Merge pull request #10070 from rubys/skip_bundle_in_railties_tests
Avoid running bundler on tests that don't need it
Diffstat (limited to 'railties/lib/rails/generators/testing/behaviour.rb')
-rw-r--r-- | railties/lib/rails/generators/testing/behaviour.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/testing/behaviour.rb b/railties/lib/rails/generators/testing/behaviour.rb index caad810de8..7576eba6e0 100644 --- a/railties/lib/rails/generators/testing/behaviour.rb +++ b/railties/lib/rails/generators/testing/behaviour.rb @@ -61,7 +61,10 @@ 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={}) - capture(:stdout) { self.generator_class.start(args, config.reverse_merge(destination_root: destination_root)) } + capture(:stdout) do + args += ['--skip-bundle'] unless args.include? '--dev' + self.generator_class.start(args, config.reverse_merge(destination_root: destination_root)) + end end # Instantiate the generator. |