spec/integration/integration_spec.rb in mongoid-history-0.3.1 vs spec/integration/integration_spec.rb in mongoid-history-0.3.2

@@ -1,13 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Mongoid::History do
-  before :all do
-    class HistoryTracker
-      include Mongoid::History::Tracker
-    end
-
+  before :each do
     class Post
       include Mongoid::Document
       include Mongoid::Timestamps
       include Mongoid::History::Trackable
 
@@ -64,13 +60,11 @@
       belongs_to :updated_by, :class_name => "User"
 
       field             :title
       track_history     :on => [:title], :scope => :post, :track_create => true, :track_destroy => true, :modifier_field => :updated_by
     end
-  end
 
-  before :each do
     @user = User.create(:name => "Aaron", :email => "[e-mail]", :aliases => [ 'bob' ])
     @another_user = User.create(:name => "Another Guy", :email => "[e-mail]")
     @post = Post.create(:title => "Test", :body => "Post", :modifier => @user, :views => 100)
     @comment = @post.comments.create(:title => "test", :body => "comment", :modifier => @user)
   end
@@ -116,11 +110,11 @@
 
     describe "on destruction" do
       it "should have two history track records in post" do
         lambda {
           @post.destroy
-        }.should change(HistoryTracker, :count).by(1)
+        }.should change(Tracker, :count).by(1)
       end
 
       it "should assign destroy on track record" do
         @post.destroy
         @post.history_tracks.last.action.should == "destroy"
@@ -134,17 +128,17 @@
 
     describe "on update non-embedded" do
       it "should create a history track if changed attributes match tracked attributes" do
         lambda {
           @post.update_attributes(:title => "Another Test")
-        }.should change(HistoryTracker, :count).by(1)
+        }.should change(Tracker, :count).by(1)
       end
 
       it "should not create a history track if changed attributes do not match tracked attributes" do
         lambda {
           @post.update_attributes(:rating => "untracked")
-        }.should change(HistoryTracker, :count).by(0)
+        }.should change(Tracker, :count).by(0)
       end
 
       it "should assign modified fields" do
         @post.update_attributes(:title => "Another Test")
         @post.history_tracks.last.modified.should == {
@@ -230,11 +224,11 @@
 
       it "should create a history track if changed attributes match tracked attributes" do
         lambda {
           @post.update_attributes(:title => "Test2")
           @post.update_attributes(:title => "Test3")
-        }.should change(HistoryTracker, :count).by(2)
+        }.should change(Tracker, :count).by(2)
       end
 
       it "should create a history track of version 2" do
         @post.update_attributes(:title => "Test2")
         @post.update_attributes(:title => "Test3")
@@ -390,13 +384,9 @@
         Mongoid.instantiate_observers
         Thread.current[:mongoid_history_sweeper_controller] = self
         self.stub!(:current_user).and_return @user
         @tag_foo = @post.tags.create(:title => "foo", :updated_by => @user)
         @tag_bar = @post.tags.create(:title => "bar")
-      end
-
-      after(:each) do
-        Thread.current[:mongoid_history_sweeper_controller] = nil
       end
 
       it "should have cascaded the creation callbacks and set timestamps" do
         @tag_foo.created_at.should_not be_nil
         @tag_foo.updated_at.should_not be_nil