reform 2.3.0.rc1 → 2.5.0

data/test/validation/dry_validation_test.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
 require "test_helper"
 require "reform/form/dry"
 require "reform/form/coercion"
-
 #---
 # one "nested" Schema per form.
 class DryValidationErrorsAPITest < Minitest::Spec
@@ -15,22 +13,23 @@ class DryValidationErrorsAPITest < Minitest::Spec
     property :title
 
     validation do
-      # required(:title).filled
-      required(:title).filled(min_size?: 2)
+      params do
+        required(:title).filled(min_size?: 2)
+      end
     end
 
     property :artist do
       property :email
 
       validation do
-        required(:email).filled
+        params { required(:email).filled }
       end
 
       property :label do
         property :location
 
         validation do
-          required(:location).filled
+          params { required(:location).filled }
         end
       end
     end
@@ -40,75 +39,73 @@ class DryValidationErrorsAPITest < Minitest::Spec
       property :title
 
       validation do
-        configure do
-          config.messages_file = 'test/fixtures/dry_error_messages.yml'
-        end
+        config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
 
-        required(:title).filled
+        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)])) }
+  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: "" }] })
+    result = form.(title: nil, artist: {email: ""}, songs: [{title: "Clams have feelings too"}, {title: ""}])
 
-    result.success?.must_equal false
+    assert_equal result.success?, false
 
-    # errors.messages
-    form.errors.messages.must_equal({: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"]})
-    form.artist.errors.messages.must_equal({:email=>["must be filled"], :"label.location"=>["must be filled"]})
-    form.artist.label.errors.messages.must_equal({:location=>["must be filled"]})
-    form.songs[0].errors.messages.must_equal({})
-    form.songs[1].errors.messages.must_equal({:title=>["must be filled"]})
+    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[]
-    form.errors[:nonsense].must_be_nil
-    form.errors[:title].must_equal ["must be filled", "size cannot be less than 2"]
-    form.artist.errors[:email].must_equal ["must be filled"]
-    form.artist.label.errors[:location].must_equal ["must be filled"]
-    form.songs[0].errors[:title].must_be_nil
-    form.songs[1].errors[:title].must_equal ["must be filled"]
+    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
-    form.to_result.errors.must_equal({:title=>["must be filled"]})
-    form.to_result.messages.must_equal({:title=>["must be filled", "size cannot be less than 2"]})
-    form.to_result.hints.must_equal({:title=>["size cannot be less than 2"]})
-    form.artist.to_result.errors.must_equal({:email=>["must be filled"]})
-    form.artist.to_result.messages.must_equal({:email=>["must be filled"]})
-    form.artist.to_result.hints.must_equal({:email=>[]})
-    form.artist.label.to_result.errors.must_equal({:location=>["must be filled"]})
-    form.artist.label.to_result.messages.must_equal({:location=>["must be filled"]})
-    form.artist.label.to_result.hints.must_equal({:location=>[]})
-    form.songs[0].to_result.errors.must_equal({})
-    form.songs[0].to_result.messages.must_equal({})
-    form.songs[0].to_result.hints.must_equal({})
-    form.songs[1].to_result.errors.must_equal({:title=>["must be filled"]})
-    form.songs[1].to_result.messages.must_equal({:title=>["must be filled"]})
-    form.songs[1].to_result.hints.must_equal({:title=>[]})
-    form.songs[1].to_result.errors(locale: :de).must_equal({:title=>["muss abgefüllt sein"]})
-    form.songs[1].to_result.messages(locale: :de).must_equal({:title=>["muss abgefüllt sein"]})
-    form.songs[1].to_result.hints(locale: :de).must_equal({:title=>[]})
+    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: "" } })
+    result = form.(title: "Black Star", artist: {email: ""})
 
-    result.success?.must_equal false
+    assert_equal result.success?, false
 
     # errors.messages
-    form.errors.messages.must_equal({:"artist.email"=>["must be filled"], :"artist.label.location"=>["must be filled"], :"songs.title"=>["must be filled"]})
-    form.artist.errors.messages.must_equal({:email=>["must be filled"], :"label.location"=>["must be filled"]})
-    form.artist.label.errors.messages.must_equal({:location=>["must be filled"]})
+    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: "" } ] })
+    result = form.(title: "Black Star", artist: {email: "uhm", label: {location: "Hannover"}}, songs: [{title: ""}])
 
-    result.success?.must_equal false
-    form.errors.messages.must_equal({:"songs.title"=>["must be filled"]})
+    assert_equal result.success?, false
+    assert_equal form.errors.messages, "songs.title": ["must be filled"]
   end
 
   #---
@@ -119,9 +116,11 @@ class DryValidationErrorsAPITest < Minitest::Spec
     end
 
     validation do
-      required(:songs).each do
-        schema do
-          required(:title).filled
+      params do
+        required(:songs).each do
+          schema do
+            required(:title).filled
+          end
         end
       end
     end
@@ -129,19 +128,21 @@ class DryValidationErrorsAPITest < Minitest::Spec
 
   it do
     form = CollectionExternalValidationsForm.new(Album.new(nil, nil, [Song.new, Song.new]))
-    form.validate(songs: [ { title: "Liar"}, { title: ""} ])
+    form.validate(songs: [{title: "Liar"}, {title: ""}])
 
-    form.errors.messages.must_equal({:"songs.title"=>["must be filled"]})
-    form.songs[0].errors.messages.must_equal({})
-    form.songs[1].errors.messages.must_equal({:title=>["must be filled"]})
+    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)
-  SessionSchema = Dry::Validation.Schema do
-    required(:name).filled
-    required(:email).filled
+  SessionContract = Dry::Validation.Contract do
+    params do
+      required(:name).filled
+      required(:email).filled
+    end
   end
 
   class SessionForm < TestForm
@@ -150,20 +151,20 @@ class DryValidationExplicitSchemaTest < Minitest::Spec
     property :name
     property :email
 
-    validation schema: SessionSchema
+    validation contract: SessionContract
   end
 
-  let (:form) { SessionForm.new(Session.new) }
+  let(:form) { SessionForm.new(Session.new) }
 
   # valid.
   it do
-    form.validate(name: "Helloween", email: "yep").must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    assert form.validate(name: "Helloween", email: "yep")
+    assert_equal form.errors.messages.inspect, "{}"
   end
 
   it "invalid" do
-    form.validate(name: "", email: "yep").must_equal false
-    form.errors.messages.inspect.must_equal "{:name=>[\"must be filled\"]}"
+    assert_equal form.validate(name: "", email: "yep"), false
+    assert_equal form.errors.messages.inspect, "{:name=>[\"must be filled\"]}"
   end
 end
 
@@ -177,28 +178,31 @@ class DryValidationDefaultGroupTest < Minitest::Spec
     property :email
     property :password
     property :confirm_password
-    property :starts_at, type: Types::Form::DateTime
-    property :active, type: Types::Form::Bool
+    property :starts_at, type: Types::Params::DateTime
+    property :active, type: Types::Params::Bool
     property :color
 
     validation do
-      required(:username).filled
-      required(:email).filled
-      required(:starts_at).filled(:date_time?)
-      required(:active).filled(:bool?)
+      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
-      required(:confirm_password).filled
+      params { required(:confirm_password).filled }
     end
 
-    validation name: :dynamic_args, with: { form: true } do
-      configure do
-        def colors
-          form.colors
+    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
-      required(:color).maybe(included_in?: colors)
     end
 
     def colors
@@ -206,35 +210,40 @@ class DryValidationDefaultGroupTest < Minitest::Spec
     end
   end
 
-  let (:form) { SessionForm.new(Session.new) }
+  let(:form) { SessionForm.new(Session.new) }
 
   # valid.
   it do
-    form.validate(username: "Helloween",
-                  email:    "yep",
-                  starts_at: "01/01/2000 - 11:00",
-                  active: "true",
-                  confirm_password: 'pA55w0rd').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
-    form.validate(username: "Helloween",
-                  email:    "yep",
-                  active: 'hello',
-                  starts_at: "01/01/2000 - 11:00",
-                  color: 'purple').must_equal false
-    form.errors.messages.inspect.must_equal "{:active=>[\"must be boolean\"], :confirm_password=>[\"must be filled\"], :color=>[\"must be one of: red orange green\"]}"
+    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, :special_class)
-    SomeClass= Struct.new(:id)
+    SomeClass = Struct.new(:id)
 
     class SessionForm < TestForm
-
       property :username
       property :email
       property :password
@@ -242,58 +251,61 @@ class ValidationGroupsTest < MiniTest::Spec
       property :special_class
 
       validation do
-        required(:username).filled
-        required(:email).filled
-        required(:special_class).filled(type?: SomeClass)
+        params do
+          required(:username).filled
+          required(:email).filled
+          required(:special_class).filled(type?: SomeClass)
+        end
       end
 
       validation name: :email, if: :default do
-        required(:email).filled(min_size?: 3)
+        params { required(:email).filled(min_size?: 3) }
       end
 
-      validation name: :nested, if: :default do
-        required(:password).filled(min_size?: 2)
+      validation name: :password, if: :email do
+        params { required(:password).filled(min_size?: 2) }
       end
 
       validation name: :confirm, if: :default, after: :email do
-        required(:confirm_password).filled(min_size?: 2)
+        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",
-                      special_class: SomeClass.new(id: 15),
-                      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.must_equal({:username=>["must be filled"], :email=>["must be filled"], :special_class=>["must be filled", "must be ValidationGroupsTest::SomeClass"]})
+      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", special_class: SomeClass.new(id: 15)).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=>[\"must be filled\", \"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", special_class: SomeClass.new(id: 15)).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!", 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: "1", confirm_password: "9", special_class: SomeClass.new(id: 15)).must_equal false
-      form.errors.messages.inspect.must_equal "{:confirm_password=>[\"size cannot be less than 2\"], :password=>[\"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
 
@@ -303,48 +315,41 @@ class ValidationGroupsTest < MiniTest::Spec
       class SessionForm < TestForm
         property :username
 
-        validation name: :default, with: { user: OpenStruct.new(name: "Nick") } do
-          configure do
-            def users_name
-              user.name
-            end
+        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
-          required(:username).filled(eql?: users_name)
         end
       end
 
-      let (:form) { SessionForm.new(Session.new) }
+      let(:form) { SessionForm.new(Session.new) }
 
       # valid.
       it do
-        form.validate({ username: "Nick" }).must_equal true
-        form.errors.messages.inspect.must_equal "{}"
+        assert form.validate(username: "Nick")
+        assert_equal form.errors.messages.inspect, "{}"
       end
 
       # invalid.
       it do
-        form.validate({ username: 'Fred'}).must_equal false
-        form.errors.messages.inspect.must_equal "{:username=>[\"must be equal to Nick\"]}"
+        assert_equal form.validate(username: "Fred"), false
+        assert_equal form.errors.messages.inspect, "{:username=>[\"must be equal to Nick\"]}"
       end
     end
   end
 
   #---
-  #- validation( schema: MySchema )
   describe "with custom schema" do
     Session2 = Struct.new(:username, :email, :password)
 
-    MySchema = Dry::Validation.Schema do
-      configure do
-        config.messages_file = 'test/fixtures/dry_error_messages.yml'
-
-        def good_musical_taste?(val)
-          val.is_a? String
-        end
+    MyContract = Dry::Schema.Params do
+      config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
 
-      end
-
-      required(:password).filled(:min_size? => 6)
+      required(:password).filled(min_size?: 6)
     end
 
     class Session2Form < TestForm
@@ -352,29 +357,38 @@ class ValidationGroupsTest < MiniTest::Spec
       property :email
       property :password
 
-      validation schema: MySchema do
-        required(:username).filled
-        required(:email).filled(:good_musical_taste?)
+      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) }
+    let(:form) { Session2Form.new(Session2.new) }
 
     # valid.
     it do
-      form.validate({ username: "Helloween", email: "yep", password: "extrasafe" }).must_equal true
-      form.errors.messages.inspect.must_equal "{}"
+      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
-      form.validate({}).must_equal false
-      form.errors.messages.must_equal({:password=>["must be filled", "size cannot be less than 6"], :username=>["must be filled"], :email=>["must be filled", "you're a bad person"]})
+      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
-      form.validate({email: 1}).must_equal false
-      form.errors.messages.inspect.must_equal "{:password=>[\"must be filled\", \"size cannot be less than 6\"], :username=>[\"must be filled\"], :email=>[\"you're a bad person\"]}"
+      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
 
@@ -386,7 +400,7 @@ class ValidationGroupsTest < MiniTest::Spec
         property :title
 
         validation do
-          required(:title).filled
+          params { required(:title).filled }
         end
       end
 
@@ -394,7 +408,7 @@ class ValidationGroupsTest < MiniTest::Spec
         property :title
 
         validation do
-          required(:title).filled
+          params { required(:title).filled }
         end
       end
 
@@ -411,69 +425,63 @@ class ValidationGroupsTest < MiniTest::Spec
       end
 
       validation do
-        configure do
-          config.messages_file = "test/fixtures/dry_error_messages.yml"
-          # 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'
+        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
 
-        required(:title).filled(:good_musical_taste?)
-
-        required(:band).schema do
-          required(:name).filled
-          required(:label).schema do
-            required(:location).filled
+          required(:producers).each do
+            hash { required(:name).filled }
           end
         end
 
-        required(:producers).each do
-          schema do
-            required(:name).filled
-          end
+        rule(:title) do
+          key.failure(:good_musical_taste?) unless value != "Nickelback"
         end
-
       end
     end
 
-    let (:album) do
+    let(:album) do
       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],
+        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 (:form)  { AlbumForm.new(album) }
+    let(:form) { AlbumForm.new(album) }
 
     it "maps errors to form objects correctly" do
       result = form.validate(
         "title"  => "Nickelback",
-        "songs"  => [ {"title" => ""}, {"title" => ""} ],
+        "songs"  => [{"title" => ""}, {"title" => ""}],
         "band"   => {"size" => "", "label" => {"location" => ""}},
-        "producers" => [{"name" => ''}, {"name" => 'something lovely'}]
+        "producers" => [{"name" => ""}, {"name" => "something lovely"}]
       )
 
-      result.must_equal false
+      assert_equal result, false
       # from nested validation
-      form.errors.messages.must_equal({: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"]})
+      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.
-      form.songs[0].errors.messages.must_equal({:title=>["must be filled"]})
+      assert_equal form.songs[0].errors.messages, title: ["must be filled"]
       # hit got its own validation group.
-      form.hit.errors.messages.must_equal({:title=>["must be filled"]})
+      assert_equal form.hit.errors.messages, title: ["must be filled"]
 
-      form.band.label.errors.messages.must_equal({:location=>["must be filled"]})
-      form.band.errors.messages.must_equal({:name=>["must be filled"], :"label.location"=>["must be filled"]})
-      form.producers[0].errors.messages.must_equal({:name=>["must be filled"]})
+      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"]
 
       # TODO: use the same form structure as the top one and do the same test against messages, errors and hints.
-      form.producers[0].to_result.errors.must_equal({:name=>["must be filled"]})
-      form.producers[0].to_result.messages.must_equal({:name=>["must be filled"]})
-      form.producers[0].to_result.hints.must_equal({:name=>[]})
+      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
 
     # FIXME: fix the "must be filled error"
@@ -481,16 +489,16 @@ class ValidationGroupsTest < MiniTest::Spec
     it "renders full messages correctly" do
       result = form.validate(
         "title"  => "",
-        "songs"  => [ {"title" => ""}, {"title" => ""} ],
+        "songs"  => [{"title" => ""}, {"title" => ""}],
         "band"   => {"size" => "", "label" => {"name" => ""}},
-        "producers" => [{"name" => ''}, {"name" => ''}, {"name" => 'something lovely'}]
+        "producers" => [{"name" => ""}, {"name" => ""}, {"name" => "something lovely"}]
       )
 
-      result.must_equal false
-      form.band.errors.full_messages.must_equal ["Name must be filled", "Label Location must be filled"]
-      form.band.label.errors.full_messages.must_equal ["Location must be filled"]
-      form.producers.first.errors.full_messages.must_equal ["Name must be filled"]
-      form.errors.full_messages.must_equal ["Title must be filled", "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"]
+      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
@@ -504,39 +512,39 @@ class ValidationGroupsTest < MiniTest::Spec
         end
 
         validation do
-          configure do
-            config.messages_file = 'test/fixtures/dry_error_messages.yml'
-          end
+          config.messages.load_paths << "test/fixtures/dry_error_messages.yml"
 
-          required(:title).filled
+          params do
+            required(:title).filled
 
-          required(:band).schema do
-            required(:name).filled
-            required(:label).schema do
-              required(:location).filled
+            required(:band).schema do
+              required(:name).filled
+              required(:label).schema do
+                required(:location).filled
+              end
             end
           end
         end
       end
 
-      let (:form)  { AlbumFormWith1NestedVal.new(album) }
+      let(:form) { AlbumFormWith1NestedVal.new(album) }
 
       it "allows to access dry's result semantics per nested form" do
-        result = form.validate(
-          "title"  => "",
-          "songs"  => [ {"title" => ""}, {"title" => ""} ],
-          "band"   => {"size" => "", "label" => {"name" => ""}},
-          "producers" => [{"name" => ''}, {"name" => ''}, {"name" => 'something lovely'}]
+        form.validate(
+          "title" => "",
+          "songs" => [{"title" => ""}, {"title" => ""}],
+          "band" => {"size" => "", "label" => {"name" => ""}},
+          "producers" => [{"name" => ""}, {"name" => ""}, {"name" => "something lovely"}]
         )
 
-        form.to_result.errors.must_equal({:title=>["must be filled"]})
-        form.band.to_result.errors.must_equal({:name=>["must be filled"]})
-        form.band.label.to_result.errors.must_equal({:location=>["must be filled"]})
+        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"
-        form.to_result.errors(locale: :de).must_equal({:title=>["muss abgefüllt sein"]})
-        form.band.to_result.errors(locale: :de).must_equal({:name=>["muss abgefüllt sein"]})
-        form.band.label.to_result.errors(locale: :de).must_equal({:location=>["muss abgefüllt sein"]})
+        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
@@ -557,7 +565,7 @@ class ValidationGroupsTest < MiniTest::Spec
   #     end
   #   end
 
-  #   let (:form) { OverwritingForm.new(Session.new) }
+  #   let(:form) { OverwritingForm.new(Session.new) }
 
   #   # valid.
   #   it do
@@ -571,36 +579,43 @@ class ValidationGroupsTest < MiniTest::Spec
   #   end
   # end
 
-
   describe "inherit: true in same group" do
     class InheritSameGroupForm < TestForm
       property :username
       property :email
+      property :full_name, virtual: true
 
-      validation name: :email do
-        required(:email).filled
+      validation name: :username do
+        params do
+          required(:username).filled
+          required(:full_name).filled
+        end
       end
 
-      validation name: :email, inherit: true do # extends the above.
-        required(:username).filled
+      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=>[\"must be filled\"], :username=>[\"must be filled\"]}"
+      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 < TestForm
       property :username
@@ -608,34 +623,190 @@ class ValidationGroupsTest < MiniTest::Spec
       property :password
 
       validation name: :email do
-        required(:email).filled
+        params { required(:email).filled }
       end
 
       # run this is :email group is true.
-      validation name: :after_email, if: lambda { |results| results[:email].success? } do # extends the above.
-        required(:username).filled
+      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 name: :password, if: lambda { |results| email == "john@trb.org" } do
-        required(:password).filled
+      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=>[\"must be filled\"]}"
+      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
@@ -654,7 +825,7 @@ class ValidationGroupsTest < MiniTest::Spec
   #     end
   #   end
 
-  #   let (:form) { MultipleErrorsForPropertyForm.new(Session.new) }
+  #   let(:form) { MultipleErrorsForPropertyForm.new(Session.new) }
 
   #   # valid.
   #   it do