aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-15 22:42:36 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-05-15 22:48:05 -0700
commitf3482a9fb17ba33e51d9ae096036f5f712078220 (patch)
tree3378620bd36ce46d95bcb7bdc9d3225a606caaf2
parent5904295b2327f512657a5c44503675807c45ee37 (diff)
downloadrails-f3482a9fb17ba33e51d9ae096036f5f712078220.tar.gz
rails-f3482a9fb17ba33e51d9ae096036f5f712078220.tar.bz2
rails-f3482a9fb17ba33e51d9ae096036f5f712078220.zip
Fix tests in railties
Since `bundle install` was fixed in `rails plugin new`, it now requires `rails 4.0.0.beta` version in filesystem when running tests. Instead of providing it, we can run tested command with `--dev` option, to use rails from the local directory.
-rw-r--r--railties/test/generators/plugin_new_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 5524ae9db2..b0e1865b26 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -99,7 +99,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
end
def test_generation_runs_bundle_install_with_full_and_mountable
- result = run_generator [destination_root, "--mountable", "--full"]
+ result = run_generator [destination_root, "--mountable", "--full", "--dev"]
assert_file "#{destination_root}/Gemfile.lock" do |contents|
assert_match(/bukkits/, contents)
end