diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-26 11:41:52 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-26 11:41:52 +0200 |
| commit | 9789d221373123d5d9c26173985080881fcb536a (patch) | |
| tree | d9f21d92018795f9c23833764624b1ba9cf523e3 /railties/test | |
| parent | 1b97701e51667e6040b4c576cce9234edef1019e (diff) | |
| download | rails-9789d221373123d5d9c26173985080881fcb536a.tar.gz rails-9789d221373123d5d9c26173985080881fcb536a.tar.bz2 rails-9789d221373123d5d9c26173985080881fcb536a.zip | |
Update to latest thor.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index aca30e92b6..67a878e926 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -172,7 +172,7 @@ class AppGeneratorTest < Rails::Generators::TestCase template.instance_eval "def read; self; end" # Make the string respond to read generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template) - assert_match /It works!/, silence(:stdout){ generator.invoke } + assert_match /It works!/, silence(:stdout){ generator.invoke_all } end def test_usage_read_from_file @@ -196,14 +196,14 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_dev_option generator([destination_root], :dev => true).expects(:run).with("#{@bundle_command} install") - silence(:stdout){ generator.invoke } + silence(:stdout){ generator.invoke_all } rails_path = File.expand_path('../../..', Rails.root) assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/ end def test_edge_option generator([destination_root], :edge => true).expects(:run).with("#{@bundle_command} install") - silence(:stdout){ generator.invoke } + silence(:stdout){ generator.invoke_all } assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$/ end @@ -267,7 +267,7 @@ class CustomAppGeneratorTest < Rails::Generators::TestCase template.instance_eval "def read; self; end" # Make the string respond to read generator([destination_root], :builder => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template) - capture(:stdout) { generator.invoke } + capture(:stdout) { generator.invoke_all } DEFAULT_APP_FILES.each{ |path| assert_no_file path } end |