test_helper.rb in radiant-0.8.0

- old
+ new

@@ -1,16 +1,13 @@
-# allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/rails'
+lib_dir = File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/linked_rails'
 
-if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
-  puts "[ using linked Rails ]"
-  $:.unshift linked_rails + '/activesupport/lib'
-  $:.unshift linked_rails + '/actionpack/lib'
-else
-  require 'rubygems'
-end
-require 'action_controller'
-require 'action_view'
-
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/haml'
-require File.dirname(__FILE__) + '/../lib/sass'
+$:.unshift lib_dir unless $:.include?(lib_dir)
+require 'haml'
+require 'sass'
+
+# required because of Sass::Plugin
+unless defined? RAILS_ROOT
+  RAILS_ROOT = '.'
+  MERB_ENV = RAILS_ENV  = 'testing'
+end