diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-15 13:39:56 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-15 13:39:56 +0100 |
commit | 5252f5c1c96001795d3e723ad8e48117e34c045b (patch) | |
tree | 19e882cc8a09863e56a36d767d2b5108f84db3fe /railties/test/generators/app_generator_test.rb | |
parent | c905fce35f51b00933ab06725fc3548036caa07c (diff) | |
download | rails-5252f5c1c96001795d3e723ad8e48117e34c045b.tar.gz rails-5252f5c1c96001795d3e723ad8e48117e34c045b.tar.bz2 rails-5252f5c1c96001795d3e723ad8e48117e34c045b.zip |
Bundle automatically if --dev or --edge is given as option.
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3e3cd90bed..62ea07f14e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -144,7 +144,7 @@ class AppGeneratorTest < GeneratorsTestCase template = %{ say "It works!" } template.instance_eval "def read; self; end" # Make the string respond to read - generator([destination_root], :template => path, :database => "sqlite3").expects(:open).with(path).returns(template) + generator([destination_root], :template => path).expects(:open).with(path).returns(template) assert_match /It works!/, silence(:stdout){ generator.invoke } end @@ -168,14 +168,16 @@ class AppGeneratorTest < GeneratorsTestCase end def test_dev_option - run_generator [destination_root, "--dev"] + generator([destination_root], :dev => true).expects(:run).with("gem bundle") + silence(:stdout){ generator.invoke } rails_path = File.expand_path('../../..', Rails.root) dev_gem = %(directory #{rails_path.inspect}, :glob => "{*/,}*.gemspec") assert_file 'Gemfile', /^#{Regexp.escape(dev_gem)}$/ end def test_edge_option - run_generator [destination_root, "--edge"] + generator([destination_root], :edge => true).expects(:run).with("gem bundle") + silence(:stdout){ generator.invoke } edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git") assert_file 'Gemfile', /^#{Regexp.escape(edge_gem)}$/ end |