test/test_helper.rb in Fingertips-as_new-san-0.1.1 vs test/test_helper.rb in Fingertips-as_new-san-0.2

@@ -1,50 +1,31 @@
 require "rubygems"
-require "test/unit"
 require "test/spec"
 require 'activerecord'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
+$:.unshift File.expand_path('../../lib', __FILE__)
 require File.expand_path('../../rails/init', __FILE__)
 
 module DBSetupAndTeardownHelper
   ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
   ActiveRecord::Migration.verbose = false
   
-  def self.included(base)
-    base.class_eval do
-      before do
-        ActiveRecord::Schema.define(:version => 1) do
-          create_table :bacon_flavours do |t|
-            t.string  :name
-            t.boolean :as_new, :default => false
-            t.timestamps
-          end
-        end
+  def setup
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :bacon_flavours do |t|
+        t.string  :name
+        t.boolean :as_new, :default => false
+        t.timestamps
       end
-      
-      after do
-        ActiveRecord::Base.connection.tables.each do |table|
-          ActiveRecord::Base.connection.drop_table(table)
-        end
-      end
     end
   end
-end
-
-class BaconFlavour < ActiveRecord::Base
-  include AsNewSan
-end
-
-module Test::Spec::Rails
-  module ShouldDiffer
-    def differ(eval_str, diff)
-      before = eval(eval_str)
-      @object.call
-      assert_equal before + diff, eval(eval_str)
+  
+  def teardown
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
     end
   end
 end
 
-Test::Spec::Should.send(:include, Test::Spec::Rails::ShouldDiffer)
+class BaconFlavour < ActiveRecord::Base
+  include AsNewSan
+end
\ No newline at end of file