test/test_helper.rb in liquid_cms-0.3.0.7 vs test/test_helper.rb in liquid_cms-0.3.0.8

@@ -8,10 +8,16 @@
 
 require "rails_app/config/environment"
 require 'rails/test_help'
 require 'ostruct'
 
+if ENV['NO_CONTEXT'] == 'true'
+  Cms.setup do |config|
+    config.context_class = nil
+  end
+end
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 ActiveRecord::Migrator.migrate(File.join(File.dirname(__FILE__), "rails_app/db/migrate/"), nil)
@@ -23,9 +29,18 @@
   mattr_reader :paperclip_test_root
   @@paperclip_test_root = File.join(File.expand_path(File.dirname(__FILE__)), 'rails_app', 'test', 'fixtures')
 end
 
 require 'test_helpers/login_methods'
+require 'test_helpers/asset_helpers'
+
+class ActionController::TestCase
+  include AssetHelpers
+end
+class ActiveSupport::TestCase
+  include AssetHelpers
+end
+
 
 class ActiveSupport::TestCase
   include ActionDispatch::TestProcess
 
   self.use_transactional_fixtures = true