reform 2.3.2 → 2.3.3

data/test/from_test.rb

@@ -31,19 +31,19 @@ class AsTest < BaseTest
 
   subject { AlbumForm.new(Album.new("Best Of", hit, [Song.new("Fallout"), song2])) }
 
-  it { subject.name.must_equal "Best Of" }
-  it { subject.single.title.must_equal "Roxanne" }
-  it { subject.tracks[0].name.must_equal "Fallout" }
-  it { subject.tracks[1].name.must_equal "Roxanne" }
+  it { _(subject.name).must_equal "Best Of" }
+  it { _(subject.single.title).must_equal "Roxanne" }
+  it { _(subject.tracks[0].name).must_equal "Fallout" }
+  it { _(subject.tracks[1].name).must_equal "Roxanne" }
 
   describe "#validate" do
 
     before { subject.validate(params) }
 
-    it { subject.name.must_equal "Best Of The Police" }
-    it { subject.single.title.must_equal "So Lonely" }
-    it { subject.tracks[0].name.must_equal "Message In A Bottle" }
-    it { subject.tracks[1].name.must_equal "Roxanne" }
+    it { _(subject.name).must_equal "Best Of The Police" }
+    it { _(subject.single.title).must_equal "So Lonely" }
+    it { _(subject.tracks[0].name).must_equal "Message In A Bottle" }
+    it { _(subject.tracks[1].name).must_equal "Roxanne" }
   end
 
   describe "#sync" do
@@ -52,7 +52,7 @@ class AsTest < BaseTest
       subject.sync
     end
 
-    it { song2.title.must_equal "Livin' Ain't No Crime" }
+    it { _(song2.title).must_equal "Livin' Ain't No Crime" }
   end
 
   describe "#save (nested hash)" do
@@ -65,7 +65,7 @@ class AsTest < BaseTest
         hash = nested_hash
       end
 
-      hash.must_equal({"title" => "Best Of The Police", "hit" => {"title" => "So Lonely"}, "songs" => [{"title" => "Message In A Bottle"}, {"title" => "Roxanne"}], "band" => nil})
+      _(hash).must_equal({"title" => "Best Of The Police", "hit" => {"title" => "So Lonely"}, "songs" => [{"title" => "Message In A Bottle"}, {"title" => "Roxanne"}], "band" => nil})
     end
   end
 end

data/test/inherit_new_api.rb

@@ -52,46 +52,46 @@ class InheritTest < BaseTest
 
   it do
     subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
-    subject.hit.title.must_equal "LA Drone"
-    subject.hit.rating.must_equal 10
-    subject.errors.messages.must_equal({})
+    _(subject.hit.title).must_equal "LA Drone"
+    _(subject.hit.rating).must_equal 10
+    _(subject.errors.messages).must_equal({})
   end
 
   it do
     subject.validate({})
     assert_nil subject.model.hit.title
     assert_nil subject.model.hit.rating
-    subject.errors.messages.must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
+    _(subject.errors.messages).must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
   end
 
   it "xxx" do
     # sub hashes like :deserializer must be properly cloned when inheriting.
-    AlbumForm.options_for(:title)[:deserializer].object_id.wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
+    _(AlbumForm.options_for(:title)[:deserializer].object_id).wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
 
     # don't overwrite direct deserializer: {} configuration.
-    AlbumForm.options_for(:title)[:internal_populator].must_be_instance_of Reform::Form::Populator::Sync
-    AlbumForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if in AlbumForm"
+    _(AlbumForm.options_for(:title)[:internal_populator]).must_be_instance_of Reform::Form::Populator::Sync
+    _(AlbumForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if in AlbumForm"
 
     # AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
     # AlbumForm.options_for(:hit)[:deserializer][:instance].inspect.must_be_instance_with Reform::Form::Populator, user_proc: "Populator"
 
-    AlbumForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-    AlbumForm.options_for(:songs)[:deserializer][:skip_parse].must_be_instance_of Reform::Form::Validate::Skip::AllBlank
+    _(AlbumForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(AlbumForm.options_for(:songs)[:deserializer][:skip_parse]).must_be_instance_of Reform::Form::Validate::Skip::AllBlank
 
-    AlbumForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(AlbumForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
-    CompilationForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if from CompilationForm"
+    _(CompilationForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if from CompilationForm"
     # pp CompilationForm.options_for(:songs)
-    CompilationForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(CompilationForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
-    CompilationForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(CompilationForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
     # completely overwrite inherited.
-    CompilationForm.options_for(:hit)[:deserializer][:skip_parse].must_be_instance_of SkipParse
+    _(CompilationForm.options_for(:hit)[:deserializer][:skip_parse]).must_be_instance_of SkipParse
 
     # inherit: true with block will still inherit the original class.
-    AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
-    CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
+    _(AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
+    _(CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
   end
 
   class CDForm < AlbumForm
@@ -101,5 +101,5 @@ class InheritTest < BaseTest
     end
   end
 
-  it { CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc).must_equal "CD Populator" }
+  it { _(CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc)).must_equal "CD Populator" }
 end

data/test/inherit_old_api.rb

@@ -52,46 +52,46 @@ class InheritTest < BaseTest
 
   it do
     subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
-    subject.hit.title.must_equal "LA Drone"
-    subject.hit.rating.must_equal 10
-    subject.errors.messages.must_equal({})
+    _(subject.hit.title).must_equal "LA Drone"
+    _(subject.hit.rating).must_equal 10
+    _(subject.errors.messages).must_equal({})
   end
 
   it do
     subject.validate({})
     assert_nil subject.model.hit.title
     assert_nil subject.model.hit.rating
-    subject.errors.messages.must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
+    _(subject.errors.messages).must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
   end
 
   it "xxx" do
     # sub hashes like :deserializer must be properly cloned when inheriting.
-    AlbumForm.options_for(:title)[:deserializer].object_id.wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
+    _(AlbumForm.options_for(:title)[:deserializer].object_id).wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
 
     # don't overwrite direct deserializer: {} configuration.
-    AlbumForm.options_for(:title)[:internal_populator].must_be_instance_of Reform::Form::Populator::Sync
-    AlbumForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if in AlbumForm"
+    _(AlbumForm.options_for(:title)[:internal_populator]).must_be_instance_of Reform::Form::Populator::Sync
+    _(AlbumForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if in AlbumForm"
 
     # AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
     # AlbumForm.options_for(:hit)[:deserializer][:instance].inspect.must_be_instance_with Reform::Form::Populator, user_proc: "Populator"
 
-    AlbumForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-    AlbumForm.options_for(:songs)[:deserializer][:skip_parse].must_be_instance_of Reform::Form::Validate::Skip::AllBlank
+    _(AlbumForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(AlbumForm.options_for(:songs)[:deserializer][:skip_parse]).must_be_instance_of Reform::Form::Validate::Skip::AllBlank
 
-    AlbumForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(AlbumForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
-    CompilationForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if from CompilationForm"
+    _(CompilationForm.options_for(:title)[:deserializer][:skip_parse]).must_equal "skip_if from CompilationForm"
     # pp CompilationForm.options_for(:songs)
-    CompilationForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(CompilationForm.options_for(:songs)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
-    CompilationForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
+    _(CompilationForm.options_for(:band)[:internal_populator]).must_be_instance_of Reform::Form::Populator::IfEmpty
 
     # completely overwrite inherited.
-    CompilationForm.options_for(:hit)[:deserializer][:skip_parse].must_be_instance_of SkipParse
+    _(CompilationForm.options_for(:hit)[:deserializer][:skip_parse]).must_be_instance_of SkipParse
 
     # inherit: true with block will still inherit the original class.
-    AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
-    CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
+    _(AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
+    _(CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id).must_equal 1
   end
 
   class CDForm < AlbumForm
@@ -101,5 +101,5 @@ class InheritTest < BaseTest
     end
   end
 
-  it { CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc).must_equal "CD Populator" }
+  it { _(CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc)).must_equal "CD Populator" }
 end

data/test/module_new_api.rb

@@ -60,24 +60,24 @@ class ModuleInclusionTest < MiniTest::Spec
   let(:song) { OpenStruct.new(band: OpenStruct.new(title: "Time Again")) }
 
   # nested form from module is present and creates accessor.
-  it { SongForm.new(song).band.title.must_equal "Time Again" }
+  it { _(SongForm.new(song).band.title).must_equal "Time Again" }
 
   # methods from module get included.
-  it { SongForm.new(song).id.must_equal 1 }
-  it { SongForm.new(song).band.id.must_equal 2 }
+  it { _(SongForm.new(song).id).must_equal 1 }
+  it { _(SongForm.new(song).band.id).must_equal 2 }
 
   # validators get inherited.
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate({})
-    form.errors.messages.must_equal(band: ["must be filled"])
+    _(form.errors.messages).must_equal(band: ["must be filled"])
   end
 
   # coercion works
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate(cool: "1")
-    form.cool.must_equal true
+    _(form.cool).must_equal true
   end
 
   # include a module into a module into a class :)
@@ -106,7 +106,7 @@ class ModuleInclusionTest < MiniTest::Spec
   it do
     form = AlbumForm.new(OpenStruct.new(band: OpenStruct.new))
     form.validate("band" => {})
-    form.errors.messages.must_equal("band.title": ["must be filled"], "band.label": ["must be filled"], name: ["must be filled"])
+    _(form.errors.messages).must_equal("band.title": ["must be filled"], "band.label": ["must be filled"], name: ["must be filled"])
   end
 
   describe "module with custom accessors" do
@@ -130,8 +130,8 @@ class ModuleInclusionTest < MiniTest::Spec
     let(:song) { OpenStruct.new(id: 1, title: "Instant Mash") }
 
     it do
-      IncludingSongForm.new(song).id.must_equal 1
-      IncludingSongForm.new(song).title.must_equal "INSTANT MASH"
+      _(IncludingSongForm.new(song).id).must_equal 1
+      _(IncludingSongForm.new(song).title).must_equal "INSTANT MASH"
     end
   end
 end

data/test/module_old_api.rb

@@ -68,25 +68,25 @@ class ModuleInclusionTest < MiniTest::Spec
   let(:song) { OpenStruct.new(band: OpenStruct.new(title: "Time Again"), artist: "Ketama") }
 
   # nested form from module is present and creates accessor.
-  it { SongForm.new(song).band.title.must_equal "Time Again" }
-  it { SongForm.new(song).artist.must_equal "Ketama" }
+  it { _(SongForm.new(song).band.title).must_equal "Time Again" }
+  it { _(SongForm.new(song).artist).must_equal "Ketama" }
 
   # methods from module get included.
-  it { SongForm.new(song).id.must_equal 1 }
-  it { SongForm.new(song).band.id.must_equal 2 }
+  it { _(SongForm.new(song).id).must_equal 1 }
+  it { _(SongForm.new(song).band.id).must_equal 2 }
 
   # validators get inherited.
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate(artist: nil)
-    form.errors.messages.must_equal(artist: ["this needs to be filled"], band: ["must be filled"])
+    _(form.errors.messages).must_equal(artist: ["this needs to be filled"], band: ["must be filled"])
   end
 
   # coercion works
   it do
     form = SongForm.new(OpenStruct.new)
     form.validate({cool: "1"})
-    form.cool.must_equal true
+    _(form.cool).must_equal true
   end
 
   # include a module into a module into a class :)
@@ -115,7 +115,7 @@ class ModuleInclusionTest < MiniTest::Spec
   it do
     form = AlbumForm.new(OpenStruct.new(band: OpenStruct.new))
     form.validate("band" => {})
-    form.errors.messages.must_equal("band.title": ["must be filled"], "band.label": ["must be filled"], name: ["must be filled"])
+    _(form.errors.messages).must_equal("band.title": ["must be filled"], "band.label": ["must be filled"], name: ["must be filled"])
   end
 
   describe "module with custom accessors" do
@@ -139,8 +139,8 @@ class ModuleInclusionTest < MiniTest::Spec
     let(:song) { OpenStruct.new(id: 1, title: "Instant Mash") }
 
     it do
-      IncludingSongForm.new(song).id.must_equal 1
-      IncludingSongForm.new(song).title.must_equal "INSTANT MASH"
+      _(IncludingSongForm.new(song).id).must_equal 1
+      _(IncludingSongForm.new(song).title).must_equal "INSTANT MASH"
     end
   end
 end

data/test/parse_option_test.rb

@@ -13,13 +13,13 @@ class ParseOptionTest < MiniTest::Spec
   let(:form) { CommentForm.new(Comment.new, user: current_user) }
 
   it do
-    form.user.must_equal current_user
+    _(form.user).must_equal current_user
 
     lorem = "Lorem ipsum dolor sit amet..."
     form.validate("content" => lorem, "user" => "not the current user")
 
-    form.content.must_equal lorem
-    form.user.must_equal current_user
+    _(form.content).must_equal lorem
+    _(form.user).must_equal current_user
   end
 
   describe "using ':parse' option doesn't override other ':deserialize' options" do
@@ -30,11 +30,11 @@ class ParseOptionTest < MiniTest::Spec
     end
 
     it do
-      ArticleCommentForm.definitions.get(:user)[:deserializer][:writeable].must_equal false
-      ArticleCommentForm.definitions.get(:user)[:deserializer][:instance].must_equal "Instance"
+      _(ArticleCommentForm.definitions.get(:user)[:deserializer][:writeable]).must_equal false
+      _(ArticleCommentForm.definitions.get(:user)[:deserializer][:instance]).must_equal "Instance"
 
-      ArticleCommentForm.definitions.get(:article)[:deserializer][:writeable].must_equal true
-      ArticleCommentForm.definitions.get(:article)[:deserializer][:instance].must_equal "Instance"
+      _(ArticleCommentForm.definitions.get(:article)[:deserializer][:writeable]).must_equal true
+      _(ArticleCommentForm.definitions.get(:article)[:deserializer][:instance]).must_equal "Instance"
     end
   end
 end

data/test/parse_pipeline_test.rb

@@ -10,6 +10,6 @@ class ParsePipelineTest < MiniTest::Spec
   it "allows passing :parse_pipeline directly" do
     form = AlbumForm.new(Album.new)
     form.validate("name" => "Greatest Hits")
-    form.name.must_equal "{\"name\"=>\"Greatest Hits\"}"
+    _(form.name).must_equal "{\"name\"=>\"Greatest Hits\"}"
   end
 end

data/test/populate_new_api.rb

@@ -48,7 +48,7 @@ class PopulatorTest < MiniTest::Spec
       "name" => "override me!"
     )
 
-    form.name.must_equal "!em edirrevo"
+    _(form.name).must_equal "!em edirrevo"
   end
 
   # changing existing property :artist.
@@ -60,7 +60,7 @@ class PopulatorTest < MiniTest::Spec
       "artist" => {"name" => "Marcus Miller"}
     )
 
-    form.artist.model.object_id.must_equal old_id
+    _(form.artist.model.object_id).must_equal old_id
   end
 
   # use populator for default value on scalars?
@@ -68,36 +68,36 @@ class PopulatorTest < MiniTest::Spec
   # adding to collection via :populator.
   # valid.
   it "yyy" do
-    form.validate(
+    _(form.validate(
       "songs"  => [{"title" => "Fallout"}, {"title" => "Roxanne"},
         {"title" => "Rime Of The Ancient Mariner"}, # new song.
         {"title" => "Re-Education", "composer" => {"name" => "Rise Against"}}], # new song with new composer.
-    ).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.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].composer.model.must_be_instance_of Artist
+    _(form.songs[1].composer.model).must_be_instance_of Artist
 
-    form.songs[1].title.must_equal "Roxanne"
-    form.songs[2].title.must_equal "Rime Of The Ancient Mariner" # new song added.
-    form.songs[3].title.must_equal "Re-Education"
-    form.songs[3].composer.name.must_equal "Rise Against"
-    form.songs.size.must_equal 4
-    form.artist.name.must_equal "Bad Religion"
+    _(form.songs[1].title).must_equal "Roxanne"
+    _(form.songs[2].title).must_equal "Rime Of The Ancient Mariner" # new song added.
+    _(form.songs[3].title).must_equal "Re-Education"
+    _(form.songs[3].composer.name).must_equal "Rise Against"
+    _(form.songs.size).must_equal 4
+    _(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
 end
 
@@ -117,7 +117,7 @@ class PopulateWithMethodTest < Minitest::Spec
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    _(form.title).must_equal "!em edirrevo"
   end
 end
 
@@ -141,7 +141,7 @@ class PopulateWithCallableTest < Minitest::Spec
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    _(form.title).must_equal "!em edirrevo"
   end
 end
 
@@ -161,7 +161,7 @@ class PopulateWithProcTest < Minitest::Spec
   it "runs populator method" do
     form.validate("title" => "override me!")
 
-    form.title.must_equal "!em edirrevo"
+    _(form.title).must_equal "!em edirrevo"
   end
 end
 
@@ -216,35 +216,35 @@ class PopulateIfEmptyTest < MiniTest::Spec
   let(:form) { AlbumForm.new(album) }
 
   it do
-    form.songs.size.must_equal 2
+    _(form.songs.size).must_equal 2
 
-    form.validate(
+    _(form.validate(
       "songs" => [{"title" => "Fallout"}, {"title" => "Roxanne"},
         {"title" => "Rime Of The Ancient Mariner"}, # new song.
         {"title" => "Re-Education", "composer" => {"name" => "Rise Against"}}], # new song with new composer.
-    ).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[3].title.must_equal "Re-Education"
-    form.songs[3].composer.name.must_equal "Rise Against"
-    form.songs.size.must_equal 4
-    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[3].title).must_equal "Re-Education"
+    _(form.songs[3].composer.name).must_equal "Rise Against"
+    _(form.songs.size).must_equal 4
+    _(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
 
   # trigger artist populator. lambda calling form instance method.
@@ -252,11 +252,11 @@ class PopulateIfEmptyTest < MiniTest::Spec
     form = AlbumForm.new(album = Album.new)
     form.validate("artist" => {"name" => "From Autumn To Ashes"})
 
-    form.artist.name.must_equal "From Autumn To Ashes"
+    _(form.artist.name).must_equal "From Autumn To Ashes"
     # test lambda was executed in form context.
-    form.artist.model.must_be_instance_of AlbumForm::Sting
+    _(form.artist.model).must_be_instance_of AlbumForm::Sting
     # test lambda block arguments.
-    form.artist.model.args.to_s.must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
+    _(form.artist.model.args.to_s).must_equal "[{\"name\"=>\"From Autumn To Ashes\"}, nil]"
 
     assert_nil album.artist
   end
@@ -292,13 +292,13 @@ class PopulateIfEmptyWithDeletionTest < MiniTest::Spec
   let(:form) { AlbumForm.new(album) }
 
   it do
-    form.validate(
+    _(form.validate(
       "songs" => [{"title" => "Broken, delete me!"}, {"title" => "Roxanne"}]
-    ).must_equal true
+    )).must_equal true
 
-    form.errors.messages.inspect.must_equal "{}"
+    _(form.errors.messages.inspect).must_equal "{}"
 
-    form.songs.size.must_equal 1
-    form.songs[0].title.must_equal "Roxanne"
+    _(form.songs.size).must_equal 1
+    _(form.songs[0].title).must_equal "Roxanne"
   end
 end