Merge pull request #3266 from arunagw/warnings_removed

Warnings removed when running with 1.9.3
This commit is contained in:
Santiago Pastorino
2011-10-09 07:34:56 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -6,7 +6,7 @@ namespace :assets do
groups = ENV['RAILS_GROUPS'] || 'assets'
args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
args << "--trace" if Rake.application.options.trace
ruby *args
ruby(*args)
end
# We are currently running with no explicit bundler group

View File

@@ -65,7 +65,7 @@ module Rails
begin
"#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
rescue NameError => e
rescue NameError
Rails::Generators::ActiveModel
end
end

View File

@@ -13,7 +13,7 @@ class AssetsGeneratorTest < Rails::Generators::TestCase
end
def test_skipping_assets
content = run_generator ["posts", "--no-stylesheets", "--no-javascripts"]
run_generator ["posts", "--no-stylesheets", "--no-javascripts"]
assert_no_file "app/assets/javascripts/posts.js"
assert_no_file "app/assets/stylesheets/posts.css"
end