Use Sequel inflectors to get class name from table_name

openhood · Aug 22, 2009 · 6bcc17b · 6bcc17b
1 parent 00ae9b9
commit 6bcc17b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/rspec_sequel/base.rb b/lib/rspec_sequel/base.rb
@@ -1,3 +1,5 @@
+require "sequel/extensions/inflector"
+
 module RspecSequel
 
   class Base
@@ -13,9 +15,7 @@ def matches?(target)
         @prefix = "expected #{target.inspect} to"
         valid?(target.db, target, target.class, @attribute, @options)
       else
-        name = target.name
+        @prefix = "expected #{target.table_name.to_s.singularize.humanize} to"
-        name = target.table_name if name.nil? || name==""
-        @prefix = "expected #{name} to"
         valid?(target.db, target.new, target, @attribute, @options)
       end
     end

diff --git a/spec/have_column_matcher_spec.rb b/spec/have_column_matcher_spec.rb
@@ -56,8 +56,8 @@
       it "should set failure messages" do
         @matcher = have_column :password
         @matcher.matches? Sequel::Model(:comments)
-        @matcher.failure_message.should == "expected comments to " + @matcher.description
+        @matcher.failure_message.should == "expected Comment to " + @matcher.description
-        @matcher.negative_failure_message.should == "expected comments to not " + @matcher.description
+        @matcher.negative_failure_message.should == "expected Comment to not " + @matcher.description
       end
     end
     describe "on Sequel::Model class" do