reform 2.2.4 → 2.6.2

data/test/validation/dry_validation_test.rb

@@ -1,231 +1,556 @@
 require "test_helper"
 require "reform/form/dry"
+require "reform/form/coercion"
+#---
+# one "nested" Schema per form.
+class DryValidationErrorsAPITest < Minitest::Spec
+  Album  = Struct.new(:title, :artist, :songs)
+  Song   = Struct.new(:title)
+  Artist = Struct.new(:email, :label)
+  Label  = Struct.new(:location)
+
+  class AlbumForm < TestForm
+    property :title
+
+    validation do
+      params do
+        required(:title).filled(min_size?: 2)
+      end
+    end
+
+    property :artist do
+      property :email
+
+      validation do
+        params { required(:email).filled }
+      end
+
+      property :label do
+        property :location
+
+        validation do
+          params { required(:location).filled }
+        end
+      end
+    end
+
+    # note the validation block is *in* the collection block, per item, so to speak.
+    collection :songs do
+      property :title
+
+      validation do
+        config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
+
+        params { required(:title).filled }
+      end
+    end
+  end
+
+  let(:form) { AlbumForm.new(Album.new(nil, Artist.new(nil, Label.new), [Song.new(nil), Song.new(nil)])) }
+
+  it "everything wrong" do
+    result = form.(title: nil, artist: {email: ""}, songs: [{title: "Clams have feelings too"}, {title: ""}])
+
+    assert_equal result.success?, false
+
+    assert_equal form.errors.messages, title: ["must be filled", "size cannot be less than 2"], "artist.email": ["must be filled"], "artist.label.location": ["must be filled"], "songs.title": ["must be filled"]
+    assert_equal form.artist.errors.messages, email: ["must be filled"], "label.location": ["must be filled"]
+    assert_equal form.artist.label.errors.messages, location: ["must be filled"]
+    assert_equal form.songs[0].errors.messages, {}
+    assert_equal form.songs[1].errors.messages, title: ["must be filled"]
+
+    # #errors[]
+    assert_equal form.errors[:nonsense],  []
+    assert_equal form.errors[:title],  ["must be filled", "size cannot be less than 2"]
+    assert_equal form.artist.errors[:email],  ["must be filled"]
+    assert_equal form.artist.label.errors[:location],  ["must be filled"]
+    assert_equal form.songs[0].errors[:title],  []
+    assert_equal form.songs[1].errors[:title],  ["must be filled"]
+
+    # #to_result
+    assert_equal form.to_result.errors, title: ["must be filled"]
+    assert_equal form.to_result.messages, title: ["must be filled", "size cannot be less than 2"]
+    assert_equal form.to_result.hints, title: ["size cannot be less than 2"]
+    assert_equal form.artist.to_result.errors, email: ["must be filled"]
+    assert_equal form.artist.to_result.messages, email: ["must be filled"]
+    assert_equal form.artist.to_result.hints, {}
+    assert_equal form.artist.label.to_result.errors, location: ["must be filled"]
+    assert_equal form.artist.label.to_result.messages, location: ["must be filled"]
+    assert_equal form.artist.label.to_result.hints, {}
+    assert_equal form.songs[0].to_result.errors, {}
+    assert_equal form.songs[0].to_result.messages, {}
+    assert_equal form.songs[0].to_result.hints, {}
+    assert_equal form.songs[1].to_result.errors, title: ["must be filled"]
+    assert_equal form.songs[1].to_result.messages, title: ["must be filled"]
+    assert_equal form.songs[1].to_result.hints, {}
+    assert_equal form.songs[1].to_result.errors(locale: :de), title: ["muss abgefüllt sein"]
+    # seems like dry-v when calling Dry::Schema::Result#messages locale option is ignored
+    # started a topic in their forum https://discourse.dry-rb.org/t/dry-result-messages-ignore-locale-option/910
+    # assert_equal form.songs[1].to_result.messages(locale: :de), (title: ["muss abgefüllt sein"])
+    assert_equal form.songs[1].to_result.hints(locale: :de), ({})
+  end
+
+  it "only nested property is invalid." do
+    result = form.(title: "Black Star", artist: {email: ""})
+
+    assert_equal result.success?, false
+
+    # errors.messages
+    assert_equal form.errors.messages, "artist.email": ["must be filled"], "artist.label.location": ["must be filled"], "songs.title": ["must be filled"]
+    assert_equal form.artist.errors.messages, email: ["must be filled"], "label.location": ["must be filled"]
+    assert_equal form.artist.label.errors.messages, location: ["must be filled"]
+  end
+
+  it "nested collection invalid" do
+    result = form.(title: "Black Star", artist: {email: "uhm", label: {location: "Hannover"}}, songs: [{title: ""}])
+
+    assert_equal result.success?, false
+    assert_equal form.errors.messages, "songs.title": ["must be filled"]
+  end
+
+  #---
+  #- validation .each
+  class CollectionExternalValidationsForm < TestForm
+    collection :songs do
+      property :title
+    end
+
+    validation do
+      params do
+        required(:songs).each do
+          schema do
+            required(:title).filled
+          end
+        end
+      end
+    end
+  end
+
+  it do
+    form = CollectionExternalValidationsForm.new(Album.new(nil, nil, [Song.new, Song.new]))
+    form.validate(songs: [{title: "Liar"}, {title: ""}])
+
+    assert_equal form.errors.messages, "songs.title": ["must be filled"]
+    assert_equal form.songs[0].errors.messages, {}
+    assert_equal form.songs[1].errors.messages, title: ["must be filled"]
+  end
+end
+
+class DryValidationExplicitSchemaTest < Minitest::Spec
+  Session = Struct.new(:name, :email)
+  SessionContract = Dry::Validation.Contract do
+    params do
+      required(:name).filled
+      required(:email).filled
+    end
+  end
+
+  class SessionForm < TestForm
+    include Coercion
+
+    property :name
+    property :email
+
+    validation contract: SessionContract
+  end
+
+  let(:form) { SessionForm.new(Session.new) }
+
+  # valid.
+  it do
+    assert form.validate(name: "Helloween", email: "yep")
+    assert_equal form.errors.messages.inspect, "{}"
+  end
+
+  it "invalid" do
+    assert_equal form.validate(name: "", email: "yep"), false
+    assert_equal form.errors.messages.inspect, "{:name=>[\"must be filled\"]}"
+  end
+end
 
 class DryValidationDefaultGroupTest < Minitest::Spec
-  Session = Struct.new(:username, :email, :password, :confirm_password)
+  Session = Struct.new(:username, :email, :password, :confirm_password, :starts_at, :active, :color)
 
-  class SessionForm < Reform::Form
-    include Reform::Form::Dry
+  class SessionForm < TestForm
+    include Coercion
 
     property :username
     property :email
     property :password
     property :confirm_password
+    property :starts_at, type: Types::Params::DateTime
+    property :active, type: Types::Params::Bool
+    property :color
 
     validation do
-      key(:username).required
-      key(:email).required
+      params do
+        required(:username).filled
+        required(:email).filled
+        required(:starts_at).filled(:date_time?)
+        required(:active).filled(:bool?)
+      end
+    end
+
+    validation name: :another_block do
+      params { required(:confirm_password).filled }
+    end
+
+    validation name: :dynamic_args do
+      option :form
+      params { optional(:color) }
+      rule(:color) do
+        if value
+          key.failure("must be one of: #{form.colors}") unless form.colors.include? value
+        end
+      end
+    end
+
+    def colors
+      %(red orange green)
     end
   end
 
-  let (:form) { SessionForm.new(Session.new) }
+  let(:form) { SessionForm.new(Session.new) }
 
   # valid.
   it do
-    form.validate(username: "Helloween",
-                  email:    "yep").must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    assert form.validate(
+      username: "Helloween",
+      email:    "yep",
+      starts_at: "01/01/2000 - 11:00",
+      active: "true",
+      confirm_password: "pA55w0rd"
+    )
+    assert form.active
+    assert_equal "{}", form.errors.messages.inspect
+  end
+
+  it "invalid" do
+    assert_equal form.validate(
+      username: "Helloween",
+      email:    "yep",
+      active: "1",
+      starts_at: "01/01/2000 - 11:00",
+      color: "purple"
+    ), false
+    assert form.active
+    assert_equal form.errors.messages.inspect, "{:confirm_password=>[\"must be filled\"], :color=>[\"must be one of: red orange green\"]}"
   end
 end
 
 class ValidationGroupsTest < MiniTest::Spec
   describe "basic validations" do
-    Session = Struct.new(:username, :email, :password, :confirm_password)
-
-    class SessionForm < Reform::Form
-      include Reform::Form::Dry::Validations
+    Session = Struct.new(:username, :email, :password, :confirm_password, :special_class)
+    SomeClass = Struct.new(:id)
 
+    class SessionForm < TestForm
       property :username
       property :email
       property :password
       property :confirm_password
+      property :special_class
 
-      validation :default do
-        key(:username).required
-        key(:email).required
+      validation do
+        params do
+          required(:username).filled
+          required(:email).filled
+          required(:special_class).filled(type?: SomeClass)
+        end
       end
 
-      validation :email, if: :default do
-        key(:email).required(min_size?: 3)
+      validation name: :email, if: :default do
+        params { required(:email).filled(min_size?: 3) }
       end
 
-      validation :nested, if: :default do
-        key(:password).required(min_size?: 2)
+      validation name: :password, if: :email do
+        params { required(:password).filled(min_size?: 2) }
       end
 
-      validation :confirm, if: :default, after: :email do
-        key(:confirm_password).required(min_size?: 2)
+      validation name: :confirm, if: :default, after: :email do
+        params { required(:confirm_password).filled(min_size?: 2) }
       end
     end
 
-    let (:form) { SessionForm.new(Session.new) }
+    let(:form) { SessionForm.new(Session.new) }
 
     # valid.
     it do
-      form.validate({ username: "Helloween",
-                      email: "yep",
-                      password: "99",
-                      confirm_password: "99" }).must_equal true
-      form.errors.messages.inspect.must_equal "{}"
+      assert form.validate(
+        username: "Helloween",
+        special_class: SomeClass.new(id: 15),
+        email: "yep",
+        password: "99",
+        confirm_password: "99"
+      )
+      assert_equal form.errors.messages.inspect, "{}"
     end
 
     # invalid.
     it do
-      form.validate({}).must_equal false
-      form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"], :email=>[\"is missing\"]}"
+      assert_equal form.validate({}), false
+      assert_equal form.errors.messages, username: ["must be filled"], email: ["must be filled"], special_class: ["must be filled", "must be ValidationGroupsTest::SomeClass"]
     end
 
     # partially invalid.
     # 2nd group fails.
     it do
-      form.validate(username: "Helloween", email: "yo", confirm_password:"9").must_equal false
-      form.errors.messages.inspect.must_equal "{:email=>[\"size cannot be less than 3\"], :confirm_password=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"size cannot be less than 2\"]}"
+      assert_equal form.validate(username: "Helloween", email: "yo", confirm_password: "9", special_class: SomeClass.new(id: 15)), false
+      assert_equal form.errors.messages.inspect, "{:email=>[\"size cannot be less than 3\"], :confirm_password=>[\"size cannot be less than 2\"]}"
     end
     # 3rd group fails.
     it do
-      form.validate(username: "Helloween", email: "yo!", confirm_password:"9").must_equal false
-      form.errors.messages.inspect
-      .must_equal "{:confirm_password=>[\"size cannot be less than 2\"], :password=>[\"is missing\", \"size cannot be less than 2\"]}"
+      assert_equal form.validate(username: "Helloween", email: "yo!", confirm_password: "9", special_class: SomeClass.new(id: 15)), false
+      assert_equal form.errors.messages.inspect, "{:confirm_password=>[\"size cannot be less than 2\"], :password=>[\"must be filled\", \"size cannot be less than 2\"]}"
     end
     # 4th group with after: fails.
     it do
-      form.validate(username: "Helloween", email: "yo!", password: "", confirm_password: "9").must_equal false
-      form.errors.messages.inspect.must_equal "{:confirm_password=>[\"size cannot be less than 2\"], :password=>[\"must be filled\", \"size cannot be less than 2\"]}"
+      assert_equal form.validate(username: "Helloween", email: "yo!", password: "1", confirm_password: "9", special_class: SomeClass.new(id: 15)), false
+      assert_equal form.errors.messages.inspect, "{:confirm_password=>[\"size cannot be less than 2\"], :password=>[\"size cannot be less than 2\"]}"
     end
   end
 
-  describe "Nested validations" do
-    class AlbumForm < Reform::Form
-      include Reform::Form::Dry::Validations
+  class ValidationWithOptionsTest < MiniTest::Spec
+    describe "basic validations" do
+      Session = Struct.new(:username)
+      class SessionForm < TestForm
+        property :username
+
+        validation name: :default, with: {user: OpenStruct.new(name: "Nick")} do
+          option :user
+          params do
+            required(:username).filled
+          end
+          rule(:username) do
+            key.failure("must be equal to #{user.name}") unless user.name == value
+          end
+        end
+      end
+
+      let(:form) { SessionForm.new(Session.new) }
 
+      # valid.
+      it do
+        assert form.validate(username: "Nick")
+        assert_equal form.errors.messages.inspect, "{}"
+      end
+
+      # invalid.
+      it do
+        assert_equal form.validate(username: "Fred"), false
+        assert_equal form.errors.messages.inspect, "{:username=>[\"must be equal to Nick\"]}"
+      end
+    end
+  end
+
+  #---
+  describe "with custom schema" do
+    Session2 = Struct.new(:username, :email, :password)
+
+    MyContract = Dry::Schema.Params do
+      config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
+
+      required(:password).filled(min_size?: 6)
+    end
+
+    class Session2Form < TestForm
+      property :username
+      property :email
+      property :password
+
+      validation contract: MyContract do
+        params do
+          required(:username).filled
+          required(:email).filled
+        end
+
+        rule(:email) do
+          key.failure(:good_musical_taste?) unless value.is_a? String
+        end
+      end
+    end
+
+    let(:form) { Session2Form.new(Session2.new) }
+
+    # valid.
+    it do
+      skip "waiting dry-v to add this as feature https://github.com/dry-rb/dry-schema/issues/33"
+      assert form.validate(username: "Helloween", email: "yep", password: "extrasafe")
+      assert_equal form.errors.messages.inspect, "{}"
+    end
+
+    # invalid.
+    it do
+      skip "waiting dry-v to add this as feature https://github.com/dry-rb/dry-schema/issues/33"
+      assert_equal form.validate({}), false
+      assert_equal form.errors.messages, password: ["must be filled", "size cannot be less than 6"], username: ["must be filled"], email: ["must be filled", "you're a bad person"]
+    end
+
+    it do
+      skip "waiting dry-v to add this as feature https://github.com/dry-rb/dry-schema/issues/33"
+      assert_equal form.validate(email: 1), false
+      assert_equal form.errors.messages.inspect, "{:password=>[\"must be filled\", \"size cannot be less than 6\"], :username=>[\"must be filled\"], :email=>[\"you're a bad person\"]}"
+    end
+  end
+
+  describe "MIXED nested validations" do
+    class AlbumForm < TestForm
       property :title
 
       property :hit do
         property :title
 
-        # FIX ME: this doesn't work now, @apotonick said he knows why
-        #  The error is that this validation block act as an AM:V instead of the Dry one.
-        # validation :default do
-        #   key(:title, &:filled?)
-        # end
+        validation do
+          params { required(:title).filled }
+        end
       end
 
       collection :songs do
         property :title
+
+        validation do
+          params { required(:title).filled }
+        end
+      end
+
+      # we test this one by running an each / schema dry-v check on the main block
+      collection :producers do
+        property :name
       end
 
       property :band do
         property :name
         property :label do
-          property :name
+          property :location
         end
       end
 
-      validation :default do
-
-        key(:title).required
-
-        key(:band).schema do
-          key(:name).required
-          key(:label).schema do
-            key(:name).required
+      validation do
+        config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
+        params do
+          required(:title).filled
+          required(:band).hash do
+            required(:name).filled
+            required(:label).hash do
+              required(:location).filled
+            end
           end
-        end
 
-        configure do
-          option :form
-          # message need to be defined on fixtures/dry_error_messages
-          # d-v expects you to define your custome messages on the .yml file
-          def good_musical_taste?(value)
-            value != 'Nickelback'
-          end
-
-          def form_access_validation?(value)
-            form.title == 'Reform'
+          required(:producers).each do
+            hash { required(:name).filled }
           end
         end
 
-        key(:title).required(:good_musical_taste?)
-        key(:title).required(:form_access_validation?)
+        rule(:title) do
+          key.failure(:good_musical_taste?) unless value != "Nickelback"
+        end
       end
     end
 
-    let (:album) do
+    let(:album) do
       OpenStruct.new(
-        :title  => "Blackhawks Over Los Angeles",
-        :hit    => song,
-        :songs  => songs,
-        :band => Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
+        hit: OpenStruct.new,
+        songs: [OpenStruct.new, OpenStruct.new],
+        band: Struct.new(:name, :label).new("", OpenStruct.new),
+        producers: [OpenStruct.new, OpenStruct.new, OpenStruct.new],
       )
     end
-    let (:song)  { OpenStruct.new(:title => "Downtown") }
-    let (:songs) { [ song = OpenStruct.new(:title => "Calling"), song ] }
-    let (:form)  { AlbumForm.new(album) }
 
-    # correct #validate.
-    it do
+    let(:form) { AlbumForm.new(album) }
+
+    it "maps errors to form objects correctly" do
       result = form.validate(
-        "title"  => "Reform",
-        "songs"  => [
-          {"title" => "Fallout"},
-          {"title" => "Roxanne", "composer" => {"name" => "Sting"}}
-        ],
-        "band"   => {"label" => {"name" => "Epitaph"}},
+        "title"  => "Nickelback",
+        "songs"  => [{"title" => ""}, {"title" => ""}],
+        "band"   => {"size" => "", "label" => {"location" => ""}},
+        "producers" => [{"name" => ""}, {"name" => "something lovely"}]
       )
 
-      result.must_equal true
-      form.errors.messages.inspect.must_equal "{}"
-    end
-  end
+      assert_equal result, false
+      # from nested validation
+      assert_equal form.errors.messages, title: ["you're a bad person"], "hit.title": ["must be filled"], "songs.title": ["must be filled"], "producers.name": ["must be filled"], "band.name": ["must be filled"], "band.label.location": ["must be filled"]
 
+      # songs have their own validation.
+      assert_equal form.songs[0].errors.messages, title: ["must be filled"]
+      # hit got its own validation group.
+      assert_equal form.hit.errors.messages, title: ["must be filled"]
 
-  describe "fails with :validate, :validates and :validates_with" do
+      assert_equal form.band.label.errors.messages, location: ["must be filled"]
+      assert_equal form.band.errors.messages, name: ["must be filled"], "label.location": ["must be filled"]
+      assert_equal form.producers[0].errors.messages, name: ["must be filled"]
 
-    it "throws a goddamn error" do
-      e = proc do
-        class FailingForm < Reform::Form
-          include Reform::Form::Dry::Validations
+      # TODO: use the same form structure as the top one and do the same test against messages, errors and hints.
+      assert_equal form.producers[0].to_result.errors, name: ["must be filled"]
+      assert_equal form.producers[0].to_result.messages, name: ["must be filled"]
+      assert_equal form.producers[0].to_result.hints, {}
+    end
 
-          property :username
+    # FIXME: fix the "must be filled error"
 
-          validation :email do
-            validates(:email, &:filled?)
+    it "renders full messages correctly" do
+      result = form.validate(
+        "title"  => "",
+        "songs"  => [{"title" => ""}, {"title" => ""}],
+        "band"   => {"size" => "", "label" => {"name" => ""}},
+        "producers" => [{"name" => ""}, {"name" => ""}, {"name" => "something lovely"}]
+      )
+
+      assert_equal result, false
+      assert_equal form.band.errors.full_messages, ["Name must be filled", "Label Location must be filled"]
+      assert_equal form.band.label.errors.full_messages, ["Location must be filled"]
+      assert_equal form.producers.first.errors.full_messages, ["Name must be filled"]
+      assert_equal form.errors.full_messages, ["Title must be filled", "Hit Title must be filled", "Songs Title must be filled", "Producers Name must be filled", "Band Name must be filled", "Band Label Location must be filled"]
+    end
+
+    describe "only 1 nested validation" do
+      class AlbumFormWith1NestedVal < TestForm
+        property :title
+        property :band do
+          property :name
+          property :label do
+            property :location
           end
         end
-      end.must_raise(NoMethodError)
-      # e.message.must_equal 'validates() is not supported by Dry Validation backend.'
 
-      e = proc do
-        class FailingForm < Reform::Form
-          include Reform::Form::Dry::Validations
+        validation do
+          config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
 
-          property :username
+          params do
+            required(:title).filled
 
-          validation :email do
-            validate(:email, &:filled?)
+            required(:band).schema do
+              required(:name).filled
+              required(:label).schema do
+                required(:location).filled
+              end
+            end
           end
         end
-      end.must_raise(NoMethodError)
-      # e.message.must_equal 'validate() is not supported by Dry Validation backend.'
+      end
 
-      e = proc do
-        class FailingForm < Reform::Form
-          include Reform::Form::Dry::Validations
+      let(:form) { AlbumFormWith1NestedVal.new(album) }
 
-          property :username
+      it "allows to access dry's result semantics per nested form" do
+        form.validate(
+          "title" => "",
+          "songs" => [{"title" => ""}, {"title" => ""}],
+          "band" => {"size" => "", "label" => {"name" => ""}},
+          "producers" => [{"name" => ""}, {"name" => ""}, {"name" => "something lovely"}]
+        )
 
-          validation :email do
-            validates_with(:email, &:filled?)
-          end
-        end
-      end.must_raise(NoMethodError)
-      # e.message.must_equal (NoMethodError)'validates_with() is not supported by Dry Validation backend.'
+        assert_equal form.to_result.errors, title: ["must be filled"]
+        assert_equal form.band.to_result.errors, name: ["must be filled"]
+        assert_equal form.band.label.to_result.errors, location: ["must be filled"]
+
+        # with locale: "de"
+        assert_equal form.to_result.errors(locale: :de), title: ["muss abgefüllt sein"]
+        assert_equal form.band.to_result.errors(locale: :de), name: ["muss abgefüllt sein"]
+        assert_equal form.band.label.to_result.errors(locale: :de), location: ["muss abgefüllt sein"]
+      end
     end
   end
 
-
   # describe "same-named group" do
-  #   class OverwritingForm < Reform::Form
+  #   class OverwritingForm < TestForm
   #     include Reform::Form::Dry::Validations
 
   #     property :username
@@ -240,7 +565,7 @@ class ValidationGroupsTest < MiniTest::Spec
   #     end
   #   end
 
-  #   let (:form) { OverwritingForm.new(Session.new) }
+  #   let(:form) { OverwritingForm.new(Session.new) }
 
   #   # valid.
   #   it do
@@ -254,82 +579,241 @@ class ValidationGroupsTest < MiniTest::Spec
   #   end
   # end
 
-
   describe "inherit: true in same group" do
-    class InheritSameGroupForm < Reform::Form
-      include Reform::Form::Dry::Validations
-
+    class InheritSameGroupForm < TestForm
       property :username
       property :email
+      property :full_name, virtual: true
 
-      validation :email do
-        key(:email).required
+      validation name: :username do
+        params do
+          required(:username).filled
+          required(:full_name).filled
+        end
       end
 
-      validation :email, inherit: true do # extends the above.
-        key(:username).required
+      validation name: :username, inherit: true do # extends the above.
+        params do
+          optional(:username).maybe(:string)
+          required(:email).filled
+        end
       end
     end
 
-    let (:form) { InheritSameGroupForm.new(Session.new) }
+    let(:form) { InheritSameGroupForm.new(Session.new) }
 
     # valid.
     it do
-      form.validate({username: "Helloween", email: 9}).must_equal true
+      skip "waiting dry-v to add this as feature https://github.com/dry-rb/dry-schema/issues/33"
+      assert form.validate(email: 9)
     end
 
     # invalid.
     it do
-      form.validate({}).must_equal false
-      form.errors.messages.inspect.must_equal "{:email=>[\"is missing\"], :username=>[\"is missing\"]}"
+      skip "waiting dry-v to add this as feature https://github.com/dry-rb/dry-schema/issues/33"
+      assert_equal form.validate({}), false
+      assert_equal form.errors.messages, email: ["must be filled"], full_name: ["must be filled"]
     end
   end
 
-
   describe "if: with lambda" do
-    class IfWithLambdaForm < Reform::Form
-      include Reform::Form::Dry::Validations # ::build_errors.
-
+    class IfWithLambdaForm < TestForm
       property :username
       property :email
       property :password
 
-      validation :email do
-        key(:email).required
+      validation name: :email do
+        params { required(:email).filled }
       end
 
       # run this is :email group is true.
-      validation :after_email, if: lambda { |results| results[:email]==true } do # extends the above.
-        key(:username).required
+      validation name: :after_email, if: ->(results) { results[:email].success? } do # extends the above.
+        params { required(:username).filled }
       end
 
       # block gets evaled in form instance context.
-      validation :password, if: lambda { |results| email == "john@trb.org" } do
-        key(:password).required
+      validation name: :password, if: ->(results) { email == "john@trb.org" } do
+        params { required(:password).filled }
       end
     end
 
-    let (:form) { IfWithLambdaForm.new(Session.new) }
+    let(:form) { IfWithLambdaForm.new(Session.new) }
 
     # valid.
     it do
-      form.validate({username: "Strung Out", email: 9}).must_equal true
+      assert form.validate(username: "Strung Out", email: 9)
     end
 
     # invalid.
     it do
-      form.validate({email: 9}).must_equal false
-      form.errors.messages.inspect.must_equal "{:username=>[\"is missing\"]}"
+      assert_equal form.validate(email: 9), false
+      assert_equal form.errors.messages.inspect, "{:username=>[\"must be filled\"]}"
     end
   end
 
+  class NestedSchemaValidationTest < MiniTest::Spec
+    AddressSchema = Dry::Schema.Params do
+      required(:company).filled(:int?)
+    end
+
+    class OrderForm < TestForm
+      property :delivery_address do
+        property :company
+      end
+
+      validation do
+        params { required(:delivery_address).schema(AddressSchema) }
+      end
+    end
+
+    let(:company) { Struct.new(:company) }
+    let(:order) { Struct.new(:delivery_address) }
+    let(:form)  { OrderForm.new(order.new(company.new)) }
+
+    it "has company error" do
+      assert_equal form.validate(delivery_address: {company: "not int"}), false
+      assert_equal form.errors.messages, :"delivery_address.company" => ["must be an integer"]
+    end
+  end
+
+  class NestedSchemaValidationWithFormTest < MiniTest::Spec
+    class CompanyForm < TestForm
+      property :company
+
+      validation do
+        params { required(:company).filled(:int?) }
+      end
+    end
+
+    class OrderFormWithForm < TestForm
+      property :delivery_address, form: CompanyForm
+    end
+
+    let(:company) { Struct.new(:company) }
+    let(:order)   { Struct.new(:delivery_address) }
+    let(:form)    { OrderFormWithForm.new(order.new(company.new)) }
+
+    it "has company error" do
+      assert_equal form.validate(delivery_address: {company: "not int"}), false
+      assert_equal form.errors.messages, :"delivery_address.company" => ["must be an integer"]
+    end
+  end
+
+  class CollectionPropertyWithCustomRuleTest < MiniTest::Spec
+    Artist = Struct.new(:first_name, :last_name)
+    Song   = Struct.new(:title, :enabled)
+    Album  = Struct.new(:title, :songs, :artist)
+
+    class AlbumForm < TestForm
+      property :title
+
+      collection :songs, virtual: true, populate_if_empty: Song do
+        property :title
+        property :enabled
+
+        validation do
+          params { required(:title).filled }
+        end
+      end
+
+      property :artist, populate_if_empty: Artist do
+        property :first_name
+        property :last_name
+      end
+
+      validation do
+        config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
+
+        params do
+          required(:songs).filled
+          required(:artist).filled
+        end
+
+        rule(:songs) do
+          key.failure(:a_song?) unless value.any? { |el| el && el[:enabled] }
+        end
+
+        rule(:artist) do
+          key.failure(:with_last_name?) unless value[:last_name]
+        end
+      end
+    end
+
+    it "validates fails and shows the correct errors" do
+      form = AlbumForm.new(Album.new(nil, [], nil))
+      assert_equal form.validate(
+        "songs" => [
+          {"title" => "One", "enabled" => false},
+          {"title" => nil, "enabled" => false},
+          {"title" => "Three", "enabled" => false}
+        ],
+        "artist" => {"last_name" => nil}
+      ), false
+      assert_equal form.songs.size, 3
+
+      assert_equal form.errors.messages, {
+        :songs => ["must have at least one enabled song"],
+        :artist => ["must have last name"],
+        :"songs.title" => ["must be filled"]
+      }
+    end
+  end
+
+  class DryVWithSchemaAndParams < MiniTest::Spec
+    Foo = Struct.new(:age)
+
+    class ParamsForm < TestForm
+      property :age
+
+      validation do
+        params { required(:age).value(:integer) }
+
+        rule(:age) { key.failure("value exceeded") if value > 999 }
+      end
+    end
+
+    class SchemaForm < TestForm
+      property :age
+
+      validation do
+        schema { required(:age).value(:integer) }
+
+        rule(:age) { key.failure("value exceeded") if value > 999 }
+      end
+    end
+
+    it "using params" do
+      model = Foo.new
+      form = ParamsForm.new(model)
+      assert form.validate(age: "99")
+      form.sync
+      assert_equal model.age, "99"
+
+      form = ParamsForm.new(Foo.new)
+      assert_equal form.validate(age: "1000"), false
+      assert_equal form.errors.messages, age: ["value exceeded"]
+    end
+
+    it "using schema" do
+      model = Foo.new
+      form = SchemaForm.new(model)
+      assert_equal form.validate(age: "99"), false
+      assert form.validate(age: 99)
+      form.sync
+      assert_equal model.age, 99
+
+      form = SchemaForm.new(Foo.new)
+      assert_equal form.validate(age: 1000), false
+      assert_equal form.errors.messages, age: ["value exceeded"]
+    end
+  end
 
   # Currenty dry-v don't support that option, it doesn't make sense
   #   I've talked to @solnic and he plans to add a "hint" feature to show
   #   more errors messages than only those that have failed.
   #
   # describe "multiple errors for property" do
-  #   class MultipleErrorsForPropertyForm < Reform::Form
+  #   class MultipleErrorsForPropertyForm < TestForm
   #     include Reform::Form::Dry::Validations
 
   #     property :username
@@ -341,7 +825,7 @@ class ValidationGroupsTest < MiniTest::Spec
   #     end
   #   end
 
-  #   let (:form) { MultipleErrorsForPropertyForm.new(Session.new) }
+  #   let(:form) { MultipleErrorsForPropertyForm.new(Session.new) }
 
   #   # valid.
   #   it do