Merge branch 'bugfix/correct_failing_tests' of https://github.com/pos…

…garou/reform

test/model_reflections_test.rb

@@ -85,7 +85,7 @@ def defined_enums
     # delegate to model class.
     it do
       reflection = form.class.reflect_on_association(:artist)
-      reflection.must_be_instance_of ActiveRecord::Reflection::AssociationReflection
+      reflection.must_be_kind_of ActiveRecord::Reflection::AssociationReflection
     end
   end
 

test/validate_test.rb

@@ -260,9 +260,13 @@ class ValidateTest < BaseTest
     describe "invalid" do
       before { subject.validate({}).must_equal false }
 
-      it { subject.errors.messages.must_equal(
-        :songs => ["is too short (minimum is 1 characters)"],
-        :hit   => ["can't be blank"]) }
+      it do
+        # ensure that only hit and songs keys are present
+        subject.errors.messages.keys.sort.must_equal([:hit, :songs])
+        # validate content of hit and songs keys
+        subject.errors.messages[:hit].must_equal(["can't be blank"])
+        subject.errors.messages[:songs].first.must_match(/\Ais too short \(minimum is 1 characters?\)\z/)
+      end
     end
 
 
@@ -359,4 +363,4 @@ def songs
 
 # #sync (assumes that forms already have updated fields)
 #   model.title=
-#   song.sync
+#   song.sync