Some cleanup. Not happy yet

.gitignore

@@ -1,3 +1,3 @@
-test/rails_root/log/*.log
+test/rails_root/log/*
 pkg/*
 

lib/riot/action_controller/situation_macros.rb

@@ -44,16 +44,16 @@ def submit_request(http_method, action, parameters = nil, session = nil, flash =
         parameters ||= {}
         @request.assign_parameters(@controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
-        # @request.session = ActionController::TestSession.new(session) unless session.nil?
-        # @request.session["flash"] = @request.flash.update(flash || {})
-        # @request.session["flash"].sweep
+        @request.session = ActionController::TestSession.new(session) unless session.nil?
+        @request.session["flash"] = @request.flash.update(flash || {})
+        @request.session["flash"].sweep
 
         @controller.request = @request
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         ::ActionController::Base.class_eval { include ::ActionController::Testing }
         @controller.process_with_new_base_test(@request, @response)
-        # @request.session.delete('flash') if @request.session['flash'].blank?
+        @request.session.delete('flash') if @request.session['flash'].blank?
         @response
       end
 
@@ -73,9 +73,6 @@ def build_request_uri(action, parameters)
 
 Riot::Situation.instance_eval do
   include RiotRails::ActionController::HttpSupport
-
-  # Making routes work in the situation
-  Rails::Application.routes.named_routes.install(self)
-  include ActionController::UrlFor
+  include ::ActionController::UrlFor
   default_url_options[:host] = "test.host"
 end

test/rails_root/config/database.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: "sqlite3"
+  database: ":memory:"
+

test/rails_root/config/environment.rb

@@ -1,18 +1,20 @@
 ENV['RAILS_ENV'] = 'test'
 
+require 'sqlite3'
 require "active_record/railtie"
 require "action_controller/railtie"
 # require "action_mailer/railtie"
 # require "active_resource/railtie"
 
-module Rails
-  def self.root; File.expand_path(File.join(File.dirname(__FILE__), "..")); end
-end
-
 module RiotRails
-  class Application < Rails::Application; end
+  class Application < Rails::Application
+    config.root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    config.action_controller.session = { :key => "_riotrails_session", :secret => ("i own you." * 3) }
+  end
 end
 
+RiotRails::Application.initialize!
+
 require File.join(Rails.root, "config", "routes.rb")
 
 # Logging stuff
@@ -36,11 +38,7 @@ def shhh(&block)
 end
 
 shhh do
-  require 'sqlite3'
-  ActiveRecord::Base.configurations = {"test" => { "adapter" => "sqlite3", "database" => ":memory:"}}
-  ActiveRecord::Base.establish_connection("test")
   load(File.join(Rails.root, "db", "schema.rb"))
 end
 
 ActiveRecord::Base.logger = Logger.new(NilIO.new)
-ActionController::Base.view_paths = [File.join(Rails.root, 'app', 'views')]