aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-04-29 23:25:40 +0200
committerJosé Valim <jose.valim@gmail.com>2010-04-29 23:25:40 +0200
commitb0a53c86efcb655875e2bbcc9d81851b419516e9 (patch)
tree0314cffa4931c04083a5ac4a6b9f9121dcc9a90a /railties
parentda840d13da865331297d5287391231b1ed39721b (diff)
downloadrails-b0a53c86efcb655875e2bbcc9d81851b419516e9.tar.gz
rails-b0a53c86efcb655875e2bbcc9d81851b419516e9.tar.bz2
rails-b0a53c86efcb655875e2bbcc9d81851b419516e9.zip
Update thor dependency to 0.13.5
Diffstat (limited to 'railties')
-rw-r--r--railties/railties.gemspec2
-rw-r--r--railties/test/generators/app_generator_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index b9278c0399..2e54f20e9c 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.has_rdoc = false
s.add_dependency('rake', '>= 0.8.3')
- s.add_dependency('thor', '~> 0.13.4')
+ s.add_dependency('thor', '~> 0.13.5')
s.add_dependency('activesupport', version)
s.add_dependency('actionpack', version)
end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index e57b5e19b4..2e402c4f3a 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -157,7 +157,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
template = %{ say "It works!" }
template.instance_eval "def read; self; end" # Make the string respond to read
- generator([destination_root], :template => path).expects(:open).with(path).returns(template)
+ generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
assert_match /It works!/, silence(:stdout){ generator.invoke }
end