Basic test working

test/helper.rb

@@ -1,20 +1,39 @@
 require "rubygems"
 require "test/unit"
-# gem install redgreen for colored test output
-begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
 require "mocha"
 
-require "active_support"
+# gem install redgreen for colored test output
+begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
 
-silence_warnings do
+if ENV["TEST_MODE"] == "rails"
+  require "active_support"
+  silence_warnings do
     require "action_controller"
     require "action_controller/integration"
-end
+  end
 
-require File.expand_path(File.dirname(__FILE__) + "/../lib/webrat")
+  class ActionController::Integration::Session
-
-class ActionController::Integration::Session
     def flunk(message)
       raise message
     end
+  end
+
+elsif ENV["TEST_MODE"] == "merb"
+  require 'merb-core'
+  require 'merb_stories'
+  #require 'spec'  #makes mocha cry
+  module Merb
+    module Test
+      class RspecStory
+        include Merb::Test::ControllerHelper
+        include Merb::Test::RouteHelper
+        include Merb::Test::ViewHelper
+      end
+   end
+  end
+  
+else
+  raise "Please set the environment variable TEST_MODE to either 'rails' or 'merb'."
 end
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/webrat")

test/visits_test.rb

@@ -5,12 +5,21 @@ RAILS_ROOT = "." unless defined?(RAILS_ROOT)
 class VisitsTest < Test::Unit::TestCase
 
   def setup
+    if ENV["TEST_MODE"] == "rails"
       @session = ActionController::Integration::Session.new
       @session.stubs(:assert_response)
       @session.stubs(:get_via_redirect)
       @response = mock
       @session.stubs(:response).returns(@response)
       @response.stubs(:body).returns("")
+    elsif ENV["TEST_MODE"] == "merb"
+      @session = Merb::Test::RspecStory.new
+      @session.stubs(:assert_response)
+      @session.stubs(:get_via_redirect)
+      @response = mock
+      @session.stubs(:response).returns(@response)
+      @response.stubs(:body).returns("")
+    end
   end
 
   def test_should_use_get