test/support/rails_helper.rb in active_assets-0.1.0 vs test/support/rails_helper.rb in active_assets-0.2.0.rc

- old
+ new

@@ -9,11 +9,16 @@ Dir[File.join(rails_root, 'public/javascripts/cache'), File.join(rails_root, 'public/stylesheets/cache')].each do |dir| FileUtils.rm_rf(dir) end end - def initialize_application_or_load_assets! + def initialize_application_or_load_sprites! + load_sprites! if Rails.application && Rails.application.instance_variable_defined?(:@ran) + initialize_application! unless Rails.application && Rails.application.instance_variable_defined?(:@ran) + end + + def initialize_application_or_load_expansions! load_assets! if Rails.application && Rails.application.instance_variable_defined?(:@ran) initialize_application! unless Rails.application && Rails.application.instance_variable_defined?(:@ran) end def load_assets! @@ -22,9 +27,13 @@ elsif File.directory?(File.join(rails_root, 'config/assets')) Dir[File.join(rails_root, 'config/assets/*.rb')].each do |f| load f end end + end + + def load_sprites! + load File.join(rails_root, 'config/sprites.rb') if File.exists?(File.join(rails_root, 'config/sprites.rb')) end def initialize_application! ActiveAssetsTest::Application.initialize! end