From f835bac31b349e94b6d690fec79e4407db848ab0 Mon Sep 17 00:00:00 2001
From: Mike Gaffney <mike@uberu.com>
Date: Mon, 12 Jan 2009 22:42:35 -0600
Subject: [PATCH] cleaning out app and getting selenium mode to work

---
 Rakefile                                     |  7 +++
 spec/integration/rails/config/environment.rb | 63 --------------------
 spec/integration/rails/test/test_helper.rb   |  7 ++-
 3 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/Rakefile b/Rakefile
index b7d127e..cbad9d5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -115,6 +115,13 @@ namespace :spec do
         raise "Rails integration tests failed" unless result
       end
     end
+    
+    task :rails_selenium do
+      Dir.chdir "spec/integration/rails" do
+        result = system "rake test_unit_selenium"
+        raise "Rails integration tests failed" unless result
+      end
+    end
 
     desc "Run the Merb integration specs"
     task :merb do
diff --git a/spec/integration/rails/config/environment.rb b/spec/integration/rails/config/environment.rb
index 279f1ab..c9b68aa 100644
--- a/spec/integration/rails/config/environment.rb
+++ b/spec/integration/rails/config/environment.rb
@@ -1,75 +1,12 @@
-# Be sure to restart your server when you modify this file
-
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
-# Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
 
-# Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-  # See Rails::Configuration for more options.
-
-  # Skip frameworks you're not going to use. To use Rails without a database
-  # you must remove the Active Record framework.
   config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  # Specify gems that this application depends on. 
-  # They can then be installed with "rake gems:install" on new installations.
-  # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "sqlite3-ruby", :lib => "sqlite3"
-  # config.gem "aws-s3", :lib => "aws/s3"
-
-  # Only load the plugins named here, in the order given. By default, all plugins 
-  # in vendor/plugins are loaded in alphabetical order.
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
-  # Make Time.zone default to the specified zone, and make Active Record store time values
-  # in the database in UTC, and return them converted to the specified local zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
   config.time_zone = 'UTC'
-
-  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
-  # All files from config/locales/*.rb,yml are added automatically.
-  # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
-
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
-  # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_rails_app_session',
     :secret      => '81f33872c27349e86f1dc2cd6708995b9c26578e6e2d8992e567cd64d96e844343149f6e2f44bf178304141db9ce39e741e0e60699867c29c51c6d7ef7dc9556'
   }
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with "rake db:sessions:create")
-  # config.action_controller.session_store = :active_record_store
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Activate observers that should always be running
-  # Please note that observers generated using script/generate observer need to have an _observer suffix
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 end
diff --git a/spec/integration/rails/test/test_helper.rb b/spec/integration/rails/test/test_helper.rb
index 82bc995..898ba07 100644
--- a/spec/integration/rails/test/test_helper.rb
+++ b/spec/integration/rails/test/test_helper.rb
@@ -6,7 +6,12 @@ require "redgreen"
 require File.dirname(__FILE__) + "/../../../../lib/webrat"
 
 Webrat.configure do |config|
-  config.mode = :rails
+  mode = case ENV['WEBRAT_INTEGRATION_MODE']
+    when 'webrat': :rails
+    when 'selenium': :selenium
+    else :rails
+  end
+  config.mode = mode
 end
 
 ActionController::Base.class_eval do