spec/associations_spec.rb in sequel_model-0.5 vs spec/associations_spec.rb in sequel_model-0.5.0.1

@@ -148,13 +148,12 @@
     end
 
     @c2 = Class.new(Sequel::Model(:nodes)) do
       attr_accessor :xxx
       
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
     @dataset = @c2.dataset
     
     @c2.dataset.extend(Module.new {
       def fetch_rows(sql)
@@ -351,21 +350,19 @@
 
   before(:each) do
     MODEL_DB.reset
 
     @c1 = Class.new(Sequel::Model(:attributes)) do
-      def self.name
-        'Attribute'
-      end
+      def self.name; 'Attribute'; end
+      def self.to_s; 'Attribute'; end
     end
 
     @c2 = Class.new(Sequel::Model(:nodes)) do
       attr_accessor :xxx
       
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
     @dataset = @c2.dataset
 
     [@c1, @c2].each do |c|
       c.dataset.extend(Module.new {
@@ -544,13 +541,12 @@
 
 describe Sequel::Model, "all_association_reflections" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
   
   it "should include all association reflection hashes" do
     @c1.all_association_reflections.should == []
@@ -570,13 +566,12 @@
 
 describe Sequel::Model, "association_reflection" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
 
   it "should return nil for nonexistent association" do
     @c1.association_reflection(:blah).should == nil
@@ -598,12 +593,11 @@
 
 describe Sequel::Model, "associations" do
   before(:each) do
     MODEL_DB.reset
     @c1 = Class.new(Sequel::Model(:nodes)) do
-      def self.name
-        'Node'
-      end
+      def self.name; 'Node'; end
+      def self.to_s; 'Node'; end
     end
   end
 
   it "should include all association names" do
     @c1.associations.should == []