reform 2.3.2 → 2.3.3

data/test/save_new_api.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
+    _(album.saved?).must_equal true
+    _(album.songs[0].title).must_equal "Fixed"
+    _(album.songs[0].saved?).must_equal true
     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})
+      _(nested_hash).must_equal({"name" => nil, "artist" => nil})
     end
   end
 end

data/test/save_old_api.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
+    _(album.saved?).must_equal true
+    _(album.songs[0].title).must_equal "Fixed"
+    _(album.songs[0].saved?).must_equal true
     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})
+      _(nested_hash).must_equal({"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"
+      _(form.name).must_equal "The Dissent Of Man"
+      _(form.songs[0].title).must_equal "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"
+      _(form.songs[1].title).must_equal "Resist Stance"
+      _(form.songs[1].composer.name).must_equal "Greg Graffin"
+      _(form.artist.name).must_equal "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
+      _(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
     end
   end
 end

data/test/skip_if_new_api.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"
+    _(form.validate("hit" => {"title" => "Altar Of Sacrifice"})).must_equal true
+    _(form.hit.title).must_equal "Altar Of Sacrifice"
   end
 
   # skips deserialization when not present.
   it do
     form = AlbumForm.new(Album.new)
-    form.validate("hit" => {"title" => ""}).must_equal true
+    _(form.validate("hit" => {"title" => ""})).must_equal true
     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"
+    _(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"
   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"
+    _(form.validate("songs" => [{"title" => "Apathy"}, {"title" => "", "length" => ""}])).must_equal true
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "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"
+    _(form.validate("songs" => [{"title" => "", "length" => ""}, {"title" => "Apathy"}])).must_equal true
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "Apathy"
   end
 end
 

data/test/skip_if_old_api.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"
+    _(form.validate("hit" => {"title" => "Altar Of Sacrifice"})).must_equal true
+    _(form.hit.title).must_equal "Altar Of Sacrifice"
   end
 
   # skips deserialization when not present.
   it do
     form = AlbumForm.new(Album.new)
-    form.validate("hit" => {"title" => ""}).must_equal true
+    _(form.validate("hit" => {"title" => ""})).must_equal true
     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"
+    _(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"
   end
 end
 
@@ -58,23 +58,23 @@ 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"
+    _(form.validate("songs" => [{"title" => "Apathy"}, {"title" => "", "length" => ""}])).must_equal true
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "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"
+    _(form.validate("songs" => [{"title" => "", "length" => ""}, {"title" => "Apathy"}])).must_equal true
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "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"
+    _(form.validate(:songs => [{:title=>"", :length => ""}, {:title=>"Apathy"}])).must_equal true
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "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"
+    _(form.title).must_equal "GREATEST HITS"
+    _(form.artist.name).must_equal "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"
+    _(form.title).must_equal "ECNATSTSISER" # first, setter called, then getter.
+    _(form.artist.name).must_equal "greg graffi"
 
     form.sync
 
-    album.title.must_equal "ecnatstsiseR" # setter called, but not getter.
-    album.artist.name.must_equal "Greg Graffi"
+    _(album.title).must_equal "ecnatstsiseR" # setter called, but not getter.
+    _(album.artist.name).must_equal "Greg Graffi"
   end
 end

data/test/validate_new_api.rb

@@ -40,8 +40,8 @@ class ContractValidateTest < MiniTest::Spec
 
   # valid
   it do
-    form.validate.must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.validate).must_equal true
+    _(form.errors.messages.inspect).must_equal "{}"
   end
 
   # invalid
@@ -49,8 +49,8 @@ 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\"]}"
+    _(form.validate).must_equal false
+    _(form.errors.messages.inspect).must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"]}"
   end
 end
 
@@ -100,48 +100,48 @@ class ValidateWithoutConfigurationTest < MiniTest::Spec
       artist: form.artist.object_id, composer: form.songs[1].composer.object_id
     }
 
-    form.validate(
+    _(form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
       "artist" => {"name" => "The Police"}
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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]
+    _(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]
 
     # 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"
+    _(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"
   end
 
   # with symbols.
   it do
-    form.validate(
+    _(form.validate(
       name:   "Best Of",
       songs:  [{title: "The X-Creep"}, {title: "Trudging", composer: {name: "SNFU"}}],
       artist: {name: "The Police"}
-    ).must_equal true
+    )).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"
+    _(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"
   end
 
   # throws exception when no populators.
@@ -201,66 +201,66 @@ class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
 
   # valid.
   it("xxx") do
-    form.validate(
+    _(form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
       "artist" => {"name" => "The Police"},
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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"
+    _(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"
   end
 
   # invalid.
   it do
-    form.validate(
+    _(form.validate(
       "name"   => "",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => ""}}],
       "artist" => {"name" => ""},
-    ).must_equal false
+    )).must_equal false
 
-    form.errors.messages.inspect.must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"], :\"artist.name\"=>[\"must be filled\"]}"
+    _(form.errors.messages.inspect).must_equal "{: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(
+    _(form.validate(
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"}, {"title" => "Rime Of The Ancient Mariner"}],
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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"
+    _(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"
   end
 
   # allow writeable: false even in the deserializer.
@@ -274,7 +274,7 @@ 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"
+    _(song.title).must_equal "Unopened"
   end
 end
 

data/test/validate_old_api.rb

@@ -40,8 +40,8 @@ class ContractValidateTest < MiniTest::Spec
 
   # valid
   it do
-    form.validate.must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.validate).must_equal true
+    _(form.errors.messages.inspect).must_equal "{}"
   end
 
   # invalid
@@ -49,8 +49,8 @@ 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\"]}"
+    _(form.validate).must_equal false
+    _(form.errors.messages.inspect).must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"]}"
   end
 end
 
@@ -100,48 +100,48 @@ class ValidateWithoutConfigurationTest < MiniTest::Spec
       artist: form.artist.object_id, composer: form.songs[1].composer.object_id
     }
 
-    form.validate(
+    _(form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
       "artist" => {"name" => "The Police"}
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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]
+    _(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]
 
     # 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"
+    _(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"
   end
 
   # with symbols.
   it do
-    form.validate(
+    _(form.validate(
       name:   "Best Of",
       songs:  [{title: "The X-Creep"}, {title: "Trudging", composer: {name: "SNFU"}}],
       artist: {name: "The Police"}
-    ).must_equal true
+    )).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"
+    _(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"
   end
 
   # throws exception when no populators.
@@ -201,68 +201,68 @@ class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
 
   # valid.
   it("xxx") do
-    form.validate(
+    _(form.validate(
       "name"   => "Best Of",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => "Sting"}}],
       "artist" => {"name" => "The Police"},
-    ).must_equal true
-    form.valid?.must_equal true
+    )).must_equal true
+    _(form.valid?).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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"
+    _(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"
   end
 
   # invalid.
   it do
-    form.validate(
+    _(form.validate(
       "name"   => "",
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne", "composer" => {"name" => ""}}],
       "artist" => {"name" => ""},
-    ).must_equal false
-    form.valid?.must_equal false
+    )).must_equal false
+    _(form.valid?).must_equal false
 
-    form.errors.messages.inspect.must_equal "{:name=>[\"must be filled\"], :\"songs.composer.name\"=>[\"must be filled\"], :\"artist.name\"=>[\"must be filled\"]}"
+    _(form.errors.messages.inspect).must_equal "{: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(
+    _(form.validate(
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"}, {"title" => "Rime Of The Ancient Mariner"}],
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
     # 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"
+    _(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"
 
     # 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"
+    _(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"
   end
 
   # allow writeable: false even in the deserializer.
@@ -276,7 +276,7 @@ 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"
+    _(song.title).must_equal "Unopened"
   end
 end