Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:

	config/routes.rb
This commit is contained in:
Reinier Balt 2008-06-18 10:13:56 +02:00
commit 952a73e39d
1092 changed files with 52802 additions and 20798 deletions

View file

@ -1,19 +1,21 @@
require 'selenium_on_rails_config'
envs = SeleniumOnRailsConfig.get :environments
if envs.include? RAILS_ENV
#initialize the plugin
$LOAD_PATH << File.dirname(__FILE__) + "/lib/controllers"
require 'selenium_controller'
require File.dirname(__FILE__) + '/routes'
else
#erase all traces
$LOAD_PATH.delete lib_path
#but help user figure out what to do
unless RAILS_ENV == 'production' # don't pollute production
require File.dirname(__FILE__) + '/switch_environment/init'
end
end
require 'selenium_on_rails_config'
envs = SeleniumOnRailsConfig.get :environments
if envs.include? RAILS_ENV
#initialize the plugin
$LOAD_PATH << File.dirname(__FILE__) + "/lib/controllers"
require 'selenium_controller'
require File.dirname(__FILE__) + '/routes'
SeleniumController.prepend_view_path File.expand_path(File.dirname(__FILE__) + '/lib/views')
else
#erase all traces
$LOAD_PATH.delete lib_path
#but help user figure out what to do
unless RAILS_ENV == 'production' # don't pollute production
require File.dirname(__FILE__) + '/switch_environment/init'
end
end