reform 2.3.3 → 2.5.0

data/test/populator_skip_test.rb

@@ -21,8 +21,8 @@ class PopulatorSkipTest < MiniTest::Spec
 
     form.validate(hash)
 
-    _(form.songs.size).must_equal 2
+    assert_equal form.songs.size, 2
     assert_nil form.songs[0].title
-    _(form.songs[1].title).must_equal "Bad"
+    assert_equal form.songs[1].title, "Bad"
   end
 end

data/test/prepopulator_test.rb

@@ -37,25 +37,25 @@ class PrepopulatorTest < MiniTest::Spec
   it do
     form = AlbumForm.new(OpenStruct.new(length: 1)).prepopulate!(title: "Potemkin City Limits")
 
-    _(form.length).must_equal 1
-    _(form.title).must_equal "Another Day At Work"
-    _(form.hit.model).must_equal Song.new("Potemkin City Limits")
-    _(form.songs.size).must_equal 2
-    _(form.songs[0].model).must_equal Song.new
-    _(form.songs[1].model).must_equal Song.new
-    _(form.songs[1].model).must_equal Song.new
+    assert_equal form.length, 1
+    assert_equal form.title, "Another Day At Work"
+    assert_equal form.hit.model, Song.new("Potemkin City Limits")
+    assert_equal form.songs.size, 2
+    assert_equal form.songs[0].model, Song.new
+    assert_equal form.songs[1].model, Song.new
+    assert_equal form.songs[1].model, Song.new
     # prepopulate works more than 1 level, recursive.
     # it also passes options properly down there.
-    _(form.hit.band.model).must_equal Band.new("Potemkin City Limits")
+    assert_equal form.hit.band.model, Band.new("Potemkin City Limits")
   end
 
   # add to existing collection.
   it do
     form = AlbumForm.new(OpenStruct.new(songs: [Song.new])).prepopulate!
 
-    _(form.songs.size).must_equal 2
-    _(form.songs[0].model).must_equal Song.new
-    _(form.songs[1].model).must_equal Song.new
+    assert_equal form.songs.size, 2
+    assert_equal form.songs[0].model, Song.new
+    assert_equal form.songs[1].model, Song.new
   end
 end
 
@@ -75,7 +75,7 @@ class PrepopulateWithoutConfiguration < MiniTest::Spec
 
   subject { AlbumForm.new(OpenStruct.new(songs: [], hit: nil)).prepopulate! }
 
-  it { _(subject.songs.size).must_equal 0 }
+  it { assert_equal subject.songs.size, 0 }
 end
 
 class ManualPrepopulatorOverridingTest < MiniTest::Spec
@@ -104,8 +104,8 @@ class ManualPrepopulatorOverridingTest < MiniTest::Spec
   it do
     form = AlbumForm.new(OpenStruct.new(length: 1)).prepopulate!(title: "Potemkin City Limits")
 
-    _(form.length).must_equal 1
-    _(form.hit.model).must_equal Song.new("Potemkin City Limits")
-    _(form.hit.title).must_equal "Potemkin City Limits"
+    assert_equal form.length, 1
+    assert_equal form.hit.model, Song.new("Potemkin City Limits")
+    assert_equal form.hit.title, "Potemkin City Limits"
   end
 end

data/test/read_only_test.rb

@@ -9,6 +9,6 @@ class ReadonlyTest < MiniTest::Spec
 
   let(:form) { SongForm.new(OpenStruct.new) }
 
-  it { _(form.readonly?(:artist)).must_equal false }
-  it { _(form.readonly?(:title)).must_equal true }
+  it { refute form.readonly?(:artist) }
+  it { assert form.readonly?(:title) }
 end

data/test/readable_test.rb

@@ -15,16 +15,16 @@ class ReadableTest < MiniTest::Spec
 
     form.validate("password" => "123")
 
-    _(form.password).must_equal "123"
+    assert_equal form.password, "123"
 
     form.sync
-    _(cred.password).must_equal "123" # password written.
+    assert_equal cred.password, "123" # password written.
 
     hash = {}
     form.save do |nested|
       hash = nested
     end
 
-    _(hash).must_equal("password" => "123")
+    assert_equal hash, "password" => "123"
   }
 end

data/test/{reform_new_api.rb → reform_test.rb}

@@ -19,7 +19,7 @@ class ReformTest < Minitest::Spec
 
     it "returns empty fields" do
       assert_nil form.title
-      _(form.name).must_be_nil
+      assert_nil form.name
     end
 
     describe "and submitted values" do
@@ -27,15 +27,15 @@ class ReformTest < Minitest::Spec
         form.validate("name" => "Duran Duran")
 
         assert_nil form.title
-        _(form.name).must_equal "Duran Duran"
+        assert_equal form.name, "Duran Duran"
       end
     end
   end
 
   describe "(edit) form with existing models" do
     it "returns filled-out fields" do
-      _(form.name).must_equal  "Duran Duran"
-      _(form.title).must_equal "Rio"
+      assert_equal form.name,  "Duran Duran"
+      assert_equal form.title, "Rio"
     end
   end
 
@@ -50,13 +50,13 @@ class ReformTest < Minitest::Spec
     end
 
     it "returns true when valid" do
-      _(form.validate("name" => "Duran Duran")).must_equal true
+      assert_equal form.validate("name" => "Duran Duran"), true
     end
 
     it "exposes input via property accessors" do
       form.validate("name" => "Duran Duran")
 
-      _(form.name).must_equal "Duran Duran"
+      assert_equal form.name, "Duran Duran"
     end
 
     it "doesn't change model properties" do
@@ -81,12 +81,12 @@ class ReformTest < Minitest::Spec
       let(:form) { ValidatingForm.new(comp) }
 
       it "returns false when invalid" do
-        _(form.validate({})).must_equal false
+        assert_equal form.validate({}), false
       end
 
       it "populates errors" do
         form.validate({})
-        _(form.errors.messages).must_equal(name: ["must be filled"], title: ["must be filled"])
+        assert_equal form.errors.messages, name: ["must be filled"], title: ["must be filled"]
       end
     end
   end
@@ -100,7 +100,7 @@ class ReformTest < Minitest::Spec
     it "xxpushes data to models" do
       form.save
 
-      _(comp.name).must_equal "Diesel Boy"
+      assert_equal comp.name, "Diesel Boy"
       assert_nil comp.title
     end
 
@@ -112,13 +112,13 @@ class ReformTest < Minitest::Spec
           hash = map
         end
 
-        _(hash).must_equal("name" => "Diesel Boy", "title" => nil)
+        assert_equal hash, "name" => "Diesel Boy", "title" => nil
       end
     end
   end
 
   describe "#model" do
-    it { _(form.model).must_equal comp }
+    it { assert_equal form.model, comp }
   end
 
   describe "inheritance" do
@@ -132,9 +132,9 @@ class ReformTest < Minitest::Spec
     let(:form) { HitForm.new(OpenStruct.new()) }
     it do
       form.validate("title" => "The Body")
-      _(form.title).must_equal "The Body"
+      assert_equal form.title, "The Body"
       assert_nil form.position
-      _(form.errors.messages).must_equal(name: ["must be filled"], position: ["must be filled"])
+      assert_equal form.errors.messages, name: ["must be filled"], position: ["must be filled"]
     end
   end
 end
@@ -156,18 +156,18 @@ class OverridingAccessorsTest < BaseTest
   subject { SongForm.new(song) }
 
   # override reader for presentation.
-  it { _(subject.title).must_equal "pray" }
+  it { assert_equal subject.title, "pray" }
 
   describe "#save" do
     before { subject.validate("title" => "Hey Little World") }
 
     # reader always used
-    it { _(subject.title).must_equal "hey little worldhey little world" }
+    it { assert_equal subject.title, "hey little worldhey little world" }
 
     # the reader is not used when saving/syncing.
     it do
       subject.save do |hash|
-        _(hash["title"]).must_equal "Hey Little WorldHey Little World"
+        assert_equal hash["title"], "Hey Little WorldHey Little World"
       end
     end
 
@@ -175,7 +175,7 @@ class OverridingAccessorsTest < BaseTest
     it do
       song.extend(Saveable)
       subject.save
-      _(song.title).must_equal "Hey Little WorldHey Little World"
+      assert_equal song.title, "Hey Little WorldHey Little World"
     end
   end
 end
@@ -199,6 +199,6 @@ class MethodInFormTest < MiniTest::Spec
 
   # methods can be used instead of created accessors.
   subject { AlbumForm.new(OpenStruct.new(hit: OpenStruct.new)) }
-  it { _(subject.title).must_equal "The Suffer And The Witness" }
-  it { _(subject.hit.title).must_equal "Drones" }
+  it { assert_equal subject.title, "The Suffer And The Witness" }
+  it { assert_equal subject.hit.title, "Drones" }
 end

data/test/{save_new_api.rb → save_test.rb}

@@ -53,9 +53,9 @@ class SaveTest < BaseTest
 
     form.save
 
-    _(album.saved?).must_equal true
-    _(album.songs[0].title).must_equal "Fixed"
-    _(album.songs[0].saved?).must_equal true
+    assert album.saved?
+    assert_equal album.songs[0].title, "Fixed"
+    assert album.songs[0].saved?
     assert_nil album.artist.saved?
   end
 
@@ -70,7 +70,7 @@ class SaveTest < BaseTest
         nested_hash = hash
       end
 
-      _(nested_hash).must_equal({"name" => nil, "artist" => nil})
+      assert_equal nested_hash, "name" => nil, "artist" => nil
     end
   end
 end

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