Added tests for history + sti using inheritance rather than duplication

test/history_test.rb

@@ -133,3 +133,18 @@ def model_class
   end
 
 end
+
+class HistoryTestWithSti < HistoryTest
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  class Editorialist < Journalist
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  def model_class
+    Editorialist
+  end
+end

test/shared.rb

@@ -46,7 +46,7 @@ module Slugged
             record.slug = nil
             record.save!
             assert_nil record.slug
-            record.save
+            record.save!
             refute_nil record.slug
           end
         end

test/sti_test.rb

@@ -31,7 +31,7 @@ def self.table_exists?; false end
   end
 
   test "the configuration's model_class should be the class, not the base_class" do
-    assert_equal StiTest::Editorialist, model_class.friendly_id_config.model_class
+    assert_equal model_class, model_class.friendly_id_config.model_class
   end
 
   test "friendly_id should accept a block with single table inheritance" do
@@ -51,11 +51,28 @@ def self.table_exists?; false end
   end
 
   test "friendly_id slugs should not clash with eachother" do
-    journalist  = Journalist.create! :name => 'foo bar'
-    editoralist = Editorialist.create! :name => 'foo bar'
+    transaction do
+      journalist  = model_class.base_class.create! :name => 'foo bar'
+      editoralist = model_class.create! :name => 'foo bar'
 
-    assert_equal 'foo-bar', journalist.slug
-    assert_equal 'foo-bar--2', editoralist.slug
+      assert_equal 'foo-bar', journalist.slug
+      assert_equal 'foo-bar--2', editoralist.slug
+    end
   end
 
 end
+
+class StiTestWithHistory < StiTest
+  class Journalist < ActiveRecord::Base
+    extend FriendlyId
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  class Editorialist < Journalist
+    friendly_id :name, :use => [:slugged, :history]
+  end
+
+  def model_class
+    Editorialist
+  end
+end