test/unit/domain_test.rb in rails-erd-0.2.0 vs test/unit/domain_test.rb in rails-erd-0.3.0

@@ -26,11 +26,11 @@
   test "inspect should display relationships" do
     create_model "Foo", :bar => :references do
       belongs_to :bar
     end
     create_model "Bar"
-    assert_match %r{#<RailsERD::Domain:.* {Bar => Foo}>}, Domain.generate.inspect
+    assert_match %r{#<RailsERD::Domain:.* \{Bar => Foo\}>}, Domain.generate.inspect
   end
   
   # Entity processing ========================================================
   test "entity_for should return associated entity for given model" do
     create_model "Foo"
@@ -87,54 +87,54 @@
   # Erroneous associations ===================================================
   test "relationships should omit bad has_many associations" do
     create_model "Foo" do
       has_many :flabs
     end
-    assert_equal [], Domain.generate(:suppress_warnings => true).relationships
+    assert_equal [], Domain.generate(:warn => false).relationships
   end
   
   test "relationships should omit bad has_many through association" do
     create_model "Foo" do
       has_many :flabs, :through => :bars
     end
-    assert_equal [], Domain.generate(:suppress_warnings => true).relationships
+    assert_equal [], Domain.generate(:warn => false).relationships
   end
   
   test "relationships should omit association to model outside domain" do
     create_model "Foo" do
       has_many :bars
     end
     create_model "Bar", :foo => :references
-    assert_equal [], Domain.new([Foo], :suppress_warnings => true).relationships
+    assert_equal [], Domain.new([Foo], :warn => false).relationships
   end
 
   test "relationships should output a warning when a bad association is encountered" do
     create_model "Foo" do
       has_many :flabs
     end
     output = collect_stdout do
       Domain.generate.relationships
     end
-    assert_match /Invalid association :flabs on Foo/, output
+    assert_match /Ignoring invalid association :flabs on Foo/, output
   end
 
   test "relationships should output a warning when an association to model outside domain is encountered" do
     create_model "Foo" do
       has_many :bars
     end
     create_model "Bar", :foo => :references
     output = collect_stdout do
       Domain.new([Foo]).relationships
     end
-    assert_match /model Bar exists, but is not included in the domain/, output
+    assert_match /model Bar exists, but is not included in domain/, output
   end
 
-  test "relationships should suppress warnings when a bad association is encountered if warning suppression is enabled" do
+  test "relationships should not warn when a bad association is encountered if warnings are disabled" do
     create_model "Foo" do
       has_many :flabs
     end
     output = collect_stdout do
-      Domain.generate(:suppress_warnings => true).relationships
+      Domain.generate(:warn => false).relationships
     end
     assert_equal "", output
   end
 end