reform 2.3.2 → 2.6.1

data/test/setup_test.rb

@@ -31,18 +31,18 @@ class SetupTest < MiniTest::Spec
     it do
       form = AlbumForm.new(album)
 
-      form.name.must_equal "The Dissent Of Man"
-      form.songs[0].title.must_equal "Broken"
+      assert_equal form.name, "The Dissent Of Man"
+      assert_equal form.songs[0].title, "Broken"
       assert_nil form.songs[0].composer
-      form.songs[1].title.must_equal "Resist Stance"
-      form.songs[1].composer.name.must_equal "Greg Graffin"
-      form.artist.name.must_equal "Bad Religion"
+      assert_equal form.songs[1].title, "Resist Stance"
+      assert_equal form.songs[1].composer.name, "Greg Graffin"
+      assert_equal form.artist.name, "Bad Religion"
 
       # make sure all is wrapped in forms.
-      form.songs[0].must_be_kind_of Reform::Form
-      form.songs[1].must_be_kind_of Reform::Form
-      form.songs[1].composer.must_be_kind_of Reform::Form
-      form.artist.must_be_kind_of Reform::Form
+      assert form.songs[0].is_a? Reform::Form
+      assert form.songs[1].is_a? Reform::Form
+      assert form.songs[1].composer.is_a? Reform::Form
+      assert form.artist.is_a? Reform::Form
     end
   end
 end

data/test/{skip_if_new_api.rb → skip_if_test.rb}

@@ -26,23 +26,23 @@ class SkipIfTest < BaseTest
   # deserializes when present.
   it do
     form = AlbumForm.new(album)
-    form.validate("hit" => {"title" => "Altar Of Sacrifice"}).must_equal true
-    form.hit.title.must_equal "Altar Of Sacrifice"
+    assert form.validate("hit" => {"title" => "Altar Of Sacrifice"})
+    assert_equal form.hit.title, "Altar Of Sacrifice"
   end
 
   # skips deserialization when not present.
   it do
     form = AlbumForm.new(Album.new)
-    form.validate("hit" => {"title" => ""}).must_equal true
+    assert form.validate("hit" => {"title" => ""})
     assert_nil form.hit # hit hasn't been deserialised.
   end
 
   # skips deserialization when not present.
   it do
     form = AlbumForm.new(Album.new(nil, nil, []))
-    form.validate("songs" => [{"title" => "Waste Of Breath"}, {"title" => nil}]).must_equal true
-    form.songs.size.must_equal 1
-    form.songs[0].title.must_equal "Waste Of Breath"
+    assert form.validate("songs" => [{"title" => "Waste Of Breath"}, {"title" => nil}])
+    assert_equal form.songs.size, 1
+    assert_equal form.songs[0].title, "Waste Of Breath"
   end
 end
 
@@ -58,16 +58,16 @@ class SkipIfAllBlankTest < BaseTest
   # create only one object.
   it do
     form = AlbumForm.new(OpenStruct.new(songs: []))
-    form.validate("songs" => [{"title" => "Apathy"}, {"title" => "", "length" => ""}]).must_equal true
-    form.songs.size.must_equal 1
-    form.songs[0].title.must_equal "Apathy"
+    assert form.validate("songs" => [{"title" => "Apathy"}, {"title" => "", "length" => ""}])
+    assert_equal form.songs.size, 1
+    assert_equal form.songs[0].title, "Apathy"
   end
 
   it do
     form = AlbumForm.new(OpenStruct.new(songs: []))
-    form.validate("songs" => [{"title" => "", "length" => ""}, {"title" => "Apathy"}]).must_equal true
-    form.songs.size.must_equal 1
-    form.songs[0].title.must_equal "Apathy"
+    assert form.validate("songs" => [{"title" => "", "length" => ""}, {"title" => "Apathy"}])
+    assert_equal form.songs.size, 1
+    assert_equal form.songs[0].title, "Apathy"
   end
 end
 

data/test/skip_setter_and_getter_test.rb

@@ -37,17 +37,17 @@ class SetupSkipSetterAndGetterTest < MiniTest::Spec
     album = Album.new("Greatest Hits", artist)
     form  = AlbumForm.new(album)
 
-    form.title.must_equal "GREATEST HITS"
-    form.artist.name.must_equal "bad religion"
+    assert_equal form.title, "GREATEST HITS"
+    assert_equal form.artist.name, "bad religion"
 
     form.validate("title" => "Resiststance", "artist" => {"name" => "Greg Graffin"})
 
-    form.title.must_equal "ECNATSTSISER" # first, setter called, then getter.
-    form.artist.name.must_equal "greg graffi"
+    assert_equal form.title, "ECNATSTSISER" # first, setter called, then getter.
+    assert_equal form.artist.name, "greg graffi"
 
     form.sync
 
-    album.title.must_equal "ecnatstsiseR" # setter called, but not getter.
-    album.artist.name.must_equal "Greg Graffi"
+    assert_equal album.title, "ecnatstsiseR" # setter called, but not getter.
+    assert_equal album.artist.name, "Greg Graffi"
   end
 end

data/test/test_helper.rb

@@ -17,14 +17,9 @@ class TestContract < Reform::Contract
 end
 
 module Types
-  DRY_MODULE = Gem::Version.new(Dry::Types::VERSION) < Gem::Version.new("0.15.0") ? Dry::Types.module : Dry.Types()
-  include DRY_MODULE
+  include Dry.Types()
 end
 
-DRY_TYPES_VERSION = Gem::Version.new(Dry::Types::VERSION)
-DRY_TYPES_CONSTANT = DRY_TYPES_VERSION < Gem::Version.new("0.13.0") ? Types::Form : Types::Params
-DRY_TYPES_INT_CONSTANT = DRY_TYPES_VERSION < Gem::Version.new("0.13.0") ? Types::Form::Int : Types::Params::Integer
-
 class BaseTest < MiniTest::Spec
   class AlbumForm < TestForm
     property :title
@@ -48,6 +43,10 @@ class BaseTest < MiniTest::Spec
 end
 
 MiniTest::Spec.class_eval do
+  Song  = Struct.new(:title, :album, :composer)
+  Album = Struct.new(:name, :songs, :artist)
+  Artist = Struct.new(:name)
+
   module Saveable
     def save
       @saved = true

data/test/{validate_new_api.rb → validate_test.rb}

@@ -1,10 +1,6 @@
 require "test_helper"
 
 class ContractValidateTest < MiniTest::Spec
-  Song  = Struct.new(:title, :album, :composer)
-  Album = Struct.new(:name, :songs, :artist)
-  Artist = Struct.new(:name)
-
   class AlbumForm < TestContract
     property :name
     validation do
@@ -40,8 +36,8 @@ class ContractValidateTest < MiniTest::Spec
 
   # valid
   it do
-    form.validate.must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    assert form.validate
+    assert_equal form.errors.messages.inspect, "{}"
   end
 
   # invalid
@@ -49,17 +45,13 @@ class ContractValidateTest < MiniTest::Spec
     album.songs[1].composer.name = nil
     album.name = nil
 
-    form.validate.must_equal false
-    form.errors.messages.inspect.must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"]}"
+    assert_equal form.validate, false
+    assert_equal form.errors.messages.inspect, "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"]}"
   end
 end
 
 # no configuration results in "sync" (formerly known as parse_strategy: :sync).
 class ValidateWithoutConfigurationTest < MiniTest::Spec
-  Song  = Struct.new(:title, :album, :composer)
-  Album = Struct.new(:name, :songs, :artist)
-  Artist = Struct.new(:name)
-
   class AlbumForm < TestForm
     property :name
     validation do
@@ -100,48 +92,48 @@ class ValidateWithoutConfigurationTest < MiniTest::Spec
       artist: form.artist.object_id, composer: form.songs[1].composer.object_id
     }
 
-    form.validate(
+    assert form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
       "artist" => {"name" => "The Police"}
-    ).must_equal true
+    )
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.errors.messages.inspect, "{}"
 
     # form has updated.
-    form.name.must_equal "Best Of"
-    form.songs[0].title.must_equal "Fallout"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[1].composer.name.must_equal "Sting"
-    form.artist.name.must_equal "The Police"
+    assert_equal form.name, "Best Of"
+    assert_equal form.songs[0].title, "Fallout"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[1].composer.name, "Sting"
+    assert_equal form.artist.name, "The Police"
 
     # objects are still the same.
-    form.songs[0].object_id.must_equal object_ids[:song]
-    form.songs[1].object_id.must_equal object_ids[:song_with_composer]
-    form.songs[1].composer.object_id.must_equal object_ids[:composer]
-    form.artist.object_id.must_equal object_ids[:artist]
+    assert_equal form.songs[0].object_id, object_ids[:song]
+    assert_equal form.songs[1].object_id, object_ids[:song_with_composer]
+    assert_equal form.songs[1].composer.object_id, object_ids[:composer]
+    assert_equal form.artist.object_id, object_ids[:artist]
 
     # model has not changed, yet.
-    album.name.must_equal "The Dissent Of Man"
-    album.songs[0].title.must_equal "Broken"
-    album.songs[1].title.must_equal "Resist Stance"
-    album.songs[1].composer.name.must_equal "Greg Graffin"
-    album.artist.name.must_equal "Bad Religion"
+    assert_equal album.name, "The Dissent Of Man"
+    assert_equal album.songs[0].title, "Broken"
+    assert_equal album.songs[1].title, "Resist Stance"
+    assert_equal album.songs[1].composer.name, "Greg Graffin"
+    assert_equal album.artist.name, "Bad Religion"
   end
 
   # with symbols.
   it do
-    form.validate(
+    assert form.validate(
       name:   "Best Of",
       songs:  [{title: "The X-Creep"}, {title: "Trudging", composer: {name: "SNFU"}}],
       artist: {name: "The Police"}
-    ).must_equal true
+    )
 
-    form.name.must_equal "Best Of"
-    form.songs[0].title.must_equal "The X-Creep"
-    form.songs[1].title.must_equal "Trudging"
-    form.songs[1].composer.name.must_equal "SNFU"
-    form.artist.name.must_equal "The Police"
+    assert_equal form.name, "Best Of"
+    assert_equal form.songs[0].title, "The X-Creep"
+    assert_equal form.songs[1].title, "Trudging"
+    assert_equal form.songs[1].composer.name, "SNFU"
+    assert_equal form.artist.name, "The Police"
   end
 
   # throws exception when no populators.
@@ -155,10 +147,6 @@ class ValidateWithoutConfigurationTest < MiniTest::Spec
 end
 
 class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
-  Song  = Struct.new(:title, :album, :composer)
-  Album = Struct.new(:name, :songs, :artist)
-  Artist = Struct.new(:name)
-
   class AlbumForm < TestForm
     property :name
     validation do
@@ -201,66 +189,66 @@ class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
 
   # valid.
   it("xxx") do
-    form.validate(
+    assert form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
-      "artist" => {"name" => "The Police"},
-    ).must_equal true
+      "artist" => {"name" => "The Police"}
+    )
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.errors.messages.inspect, "{}"
 
     # form has updated.
-    form.name.must_equal "Best Of"
-    form.songs[0].title.must_equal "Fallout"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[1].composer.name.must_equal "Sting"
-    form.artist.name.must_equal "The Police"
+    assert_equal form.name, "Best Of"
+    assert_equal form.songs[0].title, "Fallout"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[1].composer.name, "Sting"
+    assert_equal form.artist.name, "The Police"
 
     # model has not changed, yet.
-    album.name.must_equal "The Dissent Of Man"
-    album.songs[0].title.must_equal "Broken"
-    album.songs[1].title.must_equal "Resist Stance"
-    album.songs[1].composer.name.must_equal "Greg Graffin"
-    album.artist.name.must_equal "Bad Religion"
+    assert_equal album.name, "The Dissent Of Man"
+    assert_equal album.songs[0].title, "Broken"
+    assert_equal album.songs[1].title, "Resist Stance"
+    assert_equal album.songs[1].composer.name, "Greg Graffin"
+    assert_equal album.artist.name, "Bad Religion"
   end
 
   # invalid.
   it do
-    form.validate(
+    assert_equal form.validate(
       "name"   => "",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => ""}}],
       "artist" => {"name" => ""},
-    ).must_equal false
+    ), false
 
-    form.errors.messages.inspect.must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"], :\"artist.name\"=>[\"must be filled\"]}"
+    assert_equal form.errors.messages.inspect, "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"], :\"artist.name\"=>[\"must be filled\"]}"
   end
 
   # adding to collection via :instance.
   # valid.
   it do
-    form.validate(
-      "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"}, {"title" => "Rime Of The Ancient Mariner"}],
-    ).must_equal true
+    assert form.validate(
+      "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"}, {"title" => "Rime Of The Ancient Mariner"}]
+    )
 
-    form.errors.messages.inspect.must_equal "{}"
+    assert_equal form.errors.messages.inspect, "{}"
 
     # form has updated.
-    form.name.must_equal "The Dissent Of Man"
-    form.songs[0].title.must_equal "Fallout"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[1].composer.name.must_equal "Greg Graffin"
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[2].title.must_equal "Rime Of The Ancient Mariner" # new song added.
-    form.songs.size.must_equal 3
-    form.artist.name.must_equal "Bad Religion"
+    assert_equal form.name, "The Dissent Of Man"
+    assert_equal form.songs[0].title, "Fallout"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[1].composer.name, "Greg Graffin"
+    assert_equal form.songs[1].title, "Roxanne"
+    assert_equal form.songs[2].title, "Rime Of The Ancient Mariner" # new song added.
+    assert_equal form.songs.size, 3
+    assert_equal form.artist.name, "Bad Religion"
 
     # model has not changed, yet.
-    album.name.must_equal "The Dissent Of Man"
-    album.songs[0].title.must_equal "Broken"
-    album.songs[1].title.must_equal "Resist Stance"
-    album.songs[1].composer.name.must_equal "Greg Graffin"
-    album.songs.size.must_equal 2
-    album.artist.name.must_equal "Bad Religion"
+    assert_equal album.name, "The Dissent Of Man"
+    assert_equal album.songs[0].title, "Broken"
+    assert_equal album.songs[1].title, "Resist Stance"
+    assert_equal album.songs[1].composer.name, "Greg Graffin"
+    assert_equal album.songs.size, 2
+    assert_equal album.artist.name, "Bad Religion"
   end
 
   # allow writeable: false even in the deserializer.
@@ -274,13 +262,12 @@ class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
     assert_nil form.title
     form.title = "Unopened"
     form.sync # only the deserializer is marked as not-writeable.
-    song.title.must_equal "Unopened"
+    assert_equal song.title, "Unopened"
   end
 end
 
+# memory leak test
 class ValidateUsingDifferentFormObject < MiniTest::Spec
-  Album = Struct.new(:name)
-
   class AlbumForm < TestForm
     property :name