From fa352c46da1b89534f2ddb04a602b7d09c0f5872 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 8 Jun 2012 00:14:05 +0200 Subject: Fix railties test suite Apparently asset_environment should not be invoked if it's not needed. This fixes broken build by getting back to the code more similar to the version changed here: 5b0a891 --- actionpack/lib/sprockets/helpers/rails_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 37c37604d5..8f0e0f8ee1 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -157,8 +157,7 @@ module Sprockets def rewrite_extension(source, dir, ext) source_ext = File.extname(source) if ext && source_ext != ".#{ext}" - asset = asset_environment[source] - if !source_ext.empty? && asset && + if !source_ext.empty? && (asset = asset_environment[source]) && asset.pathname.to_s =~ /#{source}\Z/ source else -- cgit v1.2.3