reform 2.3.2 → 2.3.3

data/test/populate_old_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

data/test/populator_skip_test.rb

@@ -21,8 +21,8 @@ class PopulatorSkipTest < MiniTest::Spec
 
     form.validate(hash)
 
-    form.songs.size.must_equal 2
+    _(form.songs.size).must_equal 2
     assert_nil form.songs[0].title
-    form.songs[1].title.must_equal "Bad"
+    _(form.songs[1].title).must_equal "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
+    _(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
     # 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")
+    _(form.hit.band.model).must_equal 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
+    _(form.songs.size).must_equal 2
+    _(form.songs[0].model).must_equal Song.new
+    _(form.songs[1].model).must_equal 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 { _(subject.songs.size).must_equal 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"
+    _(form.length).must_equal 1
+    _(form.hit.model).must_equal Song.new("Potemkin City Limits")
+    _(form.hit.title).must_equal "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 { _(form.readonly?(:artist)).must_equal false }
+  it { _(form.readonly?(:title)).must_equal true }
 end

data/test/readable_test.rb

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

data/test/reform_new_api.rb

@@ -19,7 +19,7 @@ class ReformTest < Minitest::Spec
 
     it "returns empty fields" do
       assert_nil form.title
-      form.name.must_be_nil
+      _(form.name).must_be_nil
     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"
+        _(form.name).must_equal "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"
+      _(form.name).must_equal  "Duran Duran"
+      _(form.title).must_equal "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
+      _(form.validate("name" => "Duran Duran")).must_equal true
     end
 
     it "exposes input via property accessors" do
       form.validate("name" => "Duran Duran")
 
-      form.name.must_equal "Duran Duran"
+      _(form.name).must_equal "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
+        _(form.validate({})).must_equal false
       end
 
       it "populates errors" do
         form.validate({})
-        form.errors.messages.must_equal(name: ["must be filled"], title: ["must be filled"])
+        _(form.errors.messages).must_equal(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"
+      _(comp.name).must_equal "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)
+        _(hash).must_equal("name" => "Diesel Boy", "title" => nil)
       end
     end
   end
 
   describe "#model" do
-    it { form.model.must_equal comp }
+    it { _(form.model).must_equal 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"
+      _(form.title).must_equal "The Body"
       assert_nil form.position
-      form.errors.messages.must_equal(name: ["must be filled"], position: ["must be filled"])
+      _(form.errors.messages).must_equal(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 { _(subject.title).must_equal "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 { _(subject.title).must_equal "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"
+        _(hash["title"]).must_equal "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"
+      _(song.title).must_equal "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 { _(subject.title).must_equal "The Suffer And The Witness" }
+  it { _(subject.hit.title).must_equal "Drones" }
 end

data/test/reform_old_api.rb

@@ -19,7 +19,7 @@ class ReformTest < Minitest::Spec
 
     it "returns empty fields" do
       assert_nil form.title
-      form.name.must_be_nil
+      _(form.name).must_be_nil
     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"
+        _(form.name).must_equal "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"
+      _(form.name).must_equal  "Duran Duran"
+      _(form.title).must_equal "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
+      _(form.validate("name" => "Duran Duran")).must_equal true
     end
 
     it "exposes input via property accessors" do
       form.validate("name" => "Duran Duran")
 
-      form.name.must_equal "Duran Duran"
+      _(form.name).must_equal "Duran Duran"
     end
 
     it "doesn't change model properties" do
@@ -79,12 +79,12 @@ class ReformTest < Minitest::Spec
       let(:form) { ValidatingForm.new(comp) }
 
       it "returns false when invalid" do
-        form.validate({}).must_equal false
+        _(form.validate({})).must_equal false
       end
 
       it "populates errors" do
         form.validate({})
-        form.errors.messages.must_equal({name: ["must be filled"], title: ["must be filled"]})
+        _(form.errors.messages).must_equal({name: ["must be filled"], title: ["must be filled"]})
       end
     end
   end
@@ -98,7 +98,7 @@ class ReformTest < Minitest::Spec
     it "xxpushes data to models" do
       form.save
 
-      comp.name.must_equal "Diesel Boy"
+      _(comp.name).must_equal "Diesel Boy"
       assert_nil comp.title
     end
 
@@ -110,13 +110,13 @@ class ReformTest < Minitest::Spec
           hash = map
         end
 
-        hash.must_equal({"name" => "Diesel Boy", "title" => nil})
+        _(hash).must_equal({"name" => "Diesel Boy", "title" => nil})
       end
     end
   end
 
   describe "#model" do
-    it { form.model.must_equal comp }
+    it { _(form.model).must_equal comp }
   end
 
   describe "inheritance" do
@@ -130,9 +130,9 @@ class ReformTest < Minitest::Spec
     let(:form) { HitForm.new(OpenStruct.new()) }
     it do
       form.validate({"title" => "The Body"})
-      form.title.must_equal "The Body"
+      _(form.title).must_equal "The Body"
       assert_nil form.position
-      form.errors.messages.must_equal({name: ["must be filled"], position: ["must be filled"]})
+      _(form.errors.messages).must_equal({name: ["must be filled"], position: ["must be filled"]})
     end
   end
 end
@@ -154,18 +154,18 @@ class OverridingAccessorsTest < BaseTest
   subject { SongForm.new(song) }
 
   # override reader for presentation.
-  it { subject.title.must_equal "pray" }
+  it { _(subject.title).must_equal "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 { _(subject.title).must_equal "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"
+        _(hash["title"]).must_equal "Hey Little WorldHey Little World"
       end
     end
 
@@ -173,7 +173,7 @@ class OverridingAccessorsTest < BaseTest
     it do
       song.extend(Saveable)
       subject.save
-      song.title.must_equal "Hey Little WorldHey Little World"
+      _(song.title).must_equal "Hey Little WorldHey Little World"
     end
   end
 end
@@ -197,6 +197,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 { _(subject.title).must_equal "The Suffer And The Witness" }
+  it { _(subject.hit.title).must_equal "Drones" }
 end