reform 2.3.2 → 2.3.3

data/test/default_test.rb

@@ -16,7 +16,7 @@ class DefaultTest < Minitest::Spec
   it do
     form = AlbumForm.new(Album.new(nil, [Song.new]))
 
-    form.name.must_equal "Wrong"
-    form.songs[0].title.must_equal "It's Catching Up"
+    _(form.name).must_equal "Wrong"
+    _(form.songs[0].title).must_equal "It's Catching Up"
   end
 end

data/test/deserialize_test.rb

@@ -41,9 +41,9 @@ class DeserializeTest < MiniTest::Spec
 
     form.validate(json)
 
-    form.title.must_equal "Apocalypse Soon"
-    form.artist.name.must_equal "Mute"
-    form.artist.model.object_id.must_equal artist_id
+    _(form.title).must_equal "Apocalypse Soon"
+    _(form.artist.name).must_equal "Mute"
+    _(form.artist.model.object_id).must_equal artist_id
   end
 
   describe "infering the deserializer from another form should NOT copy its populators" do
@@ -62,7 +62,7 @@ class DeserializeTest < MiniTest::Spec
       form = CompilationForm.new(Album.new)
       form.validate("artist" => {"name" => "Horowitz"}) # the deserializer doesn't know symbols.
       form.sync
-      form.artist.model.must_equal Artist.new("Horowitz", %{{"name"=>"Horowitz"}})
+      _(form.artist.model).must_equal Artist.new("Horowitz", %{{"name"=>"Horowitz"}})
     end
   end
 end
@@ -91,11 +91,11 @@ class ValidateWithBlockTest < MiniTest::Spec
       options_from:     :deserializer
     )
 
-    form.validate(json) { |params|
+    _(form.validate(json) { |params|
       deserializer.new(form).from_json(params)
-    }.must_equal true # with block must return result, too.
+    }).must_equal true # with block must return result, too.
 
-    form.title.must_equal "Apocalypse Soon"
-    form.artist.name.must_equal "Mute"
+    _(form.title).must_equal "Apocalypse Soon"
+    _(form.artist.name).must_equal "Mute"
   end
 end

data/test/errors_new_api.rb

@@ -72,22 +72,22 @@ class ErrorsTest < MiniTest::Spec
 
   describe "#validate with invalid array property" do
     it do
-      form.validate(
+      _(form.validate(
         title: "Swimming Pool - EP",
         band: {
           name: "Marie Madeleine",
           label: {name: "Ekler'o'shocK"}
         },
         artists: [42, "Good Charlotte", 43]
-      ).must_equal false
-      form.errors.messages.must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
-      form.errors.size.must_equal(1)
+      )).must_equal false
+      _(form.errors.messages).must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
+      _(form.errors.size).must_equal(1)
     end
   end
 
   describe "#errors without #validate" do
     it do
-      form.errors.size.must_equal 0
+      _(form.errors.size).must_equal 0
     end
   end
 
@@ -102,7 +102,7 @@ class ErrorsTest < MiniTest::Spec
     end
 
     it do
-      form.errors.messages.must_equal(
+      _(form.errors.messages).must_equal(
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
@@ -117,60 +117,60 @@ class ErrorsTest < MiniTest::Spec
     # end
 
     # nested forms keep their own Errors:
-    it { form.producer.errors.messages.must_equal(name: ["must be filled"]) }
-    it { form.hit.errors.messages.must_equal(title: ["must be filled"]) }
-    it { form.songs[0].errors.messages.must_equal(title: ["must be filled"]) }
+    it { _(form.producer.errors.messages).must_equal(name: ["must be filled"]) }
+    it { _(form.hit.errors.messages).must_equal(title: ["must be filled"]) }
+    it { _(form.songs[0].errors.messages).must_equal(title: ["must be filled"]) }
 
     it do
-      form.errors.messages.must_equal(
+      _(form.errors.messages).must_equal(
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
         "band.label.name": ["must be filled"],
         "producer.name": ["must be filled"]
       )
-      form.errors.size.must_equal(5)
+      _(form.errors.size).must_equal(5)
     end
   end
 
   describe "#validate with main form invalid" do
     it do
-      form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil).must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], producer: ["must be a hash"])
-      form.errors.size.must_equal(2)
+      _(form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil)).must_equal false
+      _(form.errors.messages).must_equal(title: ["must be filled"], producer: ["must be a hash"])
+      _(form.errors.size).must_equal(2)
     end
   end
 
   describe "#validate with middle nested form invalid" do
     before { @result = form.validate("hit" => {"title" => ""}, "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("hit.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("hit.title": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(1) }
   end
 
   describe "#validate with collection form invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("songs.title": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(1) }
   end
 
   describe "#validate with collection and 2-level-nested invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
-    it { form.errors.size.must_equal(2) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(2) }
   end
 
   describe "#validate with nested form using :base invalid" do
     it do
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal("band.name": ["you're a bad person"])
-      form.errors.size.must_equal(1)
+      _(result).must_equal false
+      _(form.errors.messages).must_equal("band.name": ["you're a bad person"])
+      _(form.errors.size).must_equal(1)
     end
   end
 
@@ -178,17 +178,17 @@ class ErrorsTest < MiniTest::Spec
     let(:album_title) { nil }
     it do
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"])
+      _(result).must_equal false
+      _(form.errors.messages).must_equal(title: ["must be filled"], "band.name": ["you're a bad person"])
       # add a new custom error
       form.errors.add(:policy, "error_text")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      _(form.errors.messages).must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
       # does not duplicate errors
       form.errors.add(:title, "must be filled")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      _(form.errors.messages).must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
       # merge existing errors
       form.errors.add(:policy, "another error")
-      form.errors.messages.must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
+      _(form.errors.messages).must_equal(title: ["must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
     end
   end
 
@@ -202,14 +202,14 @@ class ErrorsTest < MiniTest::Spec
       )
     end
 
-    it { @result.must_equal true }
-    it { form.hit.title.must_equal "Sacrifice" }
-    it { form.title.must_equal "Second Heat" }
-    it { form.songs.first.title.must_equal "Heart Of A Lion" }
+    it { _(@result).must_equal true }
+    it { _(form.hit.title).must_equal "Sacrifice" }
+    it { _(form.title).must_equal "Second Heat" }
+    it { _(form.songs.first.title).must_equal "Heart Of A Lion" }
     it do
       skip "WE DON'T NEED COUNT AND EMPTY? ON THE CORE ERRORS OBJECT"
-      form.errors.size.must_equal(0)
-      form.errors.empty?.must_equal(true)
+      _(form.errors.size).must_equal(0)
+      _(form.errors.empty?).must_equal(true)
     end
   end
 
@@ -219,7 +219,7 @@ class ErrorsTest < MiniTest::Spec
     # to_s is aliased to messages
     it {
       skip "why do we need Errors#to_s ?"
-      form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
+      _(form.errors.to_s).must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
     }
   end
 end

data/test/errors_old_api.rb

@@ -74,22 +74,22 @@ class ErrorsTest < MiniTest::Spec
 
   describe "#validate with invalid array property" do
     it do
-      form.validate(
+      _(form.validate(
         title: "Swimming Pool - EP",
         band: {
           name: "Marie Madeleine",
           label: {name: "Ekler'o'shocK"}
         },
         artists: [42, "Good Charlotte", 43]
-      ).must_equal false
-      form.errors.messages.must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
-      form.errors.size.must_equal(1)
+      )).must_equal false
+      _(form.errors.messages).must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
+      _(form.errors.size).must_equal(1)
     end
   end
 
   describe "#errors without #validate" do
     it do
-      form.errors.size.must_equal 0
+      _(form.errors.size).must_equal 0
     end
   end
 
@@ -104,7 +104,7 @@ class ErrorsTest < MiniTest::Spec
     end
 
     it do
-      form.errors.messages.must_equal(
+      _(form.errors.messages).must_equal(
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
@@ -119,60 +119,60 @@ class ErrorsTest < MiniTest::Spec
     # end
 
     # nested forms keep their own Errors:
-    it { form.producer.errors.messages.must_equal(name: ["must be filled"]) }
-    it { form.hit.errors.messages.must_equal(title: ["must be filled"]) }
-    it { form.songs[0].errors.messages.must_equal(title: ["must be filled"]) }
+    it { _(form.producer.errors.messages).must_equal(name: ["must be filled"]) }
+    it { _(form.hit.errors.messages).must_equal(title: ["must be filled"]) }
+    it { _(form.songs[0].errors.messages).must_equal(title: ["must be filled"]) }
 
     it do
-      form.errors.messages.must_equal(
+      _(form.errors.messages).must_equal(
         title: ["must be filled"],
         "hit.title": ["must be filled"],
         "songs.title": ["must be filled"],
         "band.label.name": ["must be filled"],
         "producer.name": ["must be filled"]
       )
-      form.errors.size.must_equal(5)
+      _(form.errors.size).must_equal(5)
     end
   end
 
   describe "#validate with main form invalid" do
     it do
-      form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil).must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], producer: ["must be a hash"])
-      form.errors.size.must_equal(2)
+      _(form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil)).must_equal false
+      _(form.errors.messages).must_equal(title: ["must be filled"], producer: ["must be a hash"])
+      _(form.errors.size).must_equal(2)
     end
   end
 
   describe "#validate with middle nested form invalid" do
     before { @result = form.validate("hit" => {"title" => ""}, "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("hit.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("hit.title": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(1) }
   end
 
   describe "#validate with collection form invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {name: "Fat Wreck"}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("songs.title": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(1) }
   end
 
   describe "#validate with collection and 2-level-nested invalid" do
     before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {}}) }
 
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
-    it { form.errors.size.must_equal(2) }
+    it { _(@result).must_equal false }
+    it { _(form.errors.messages).must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
+    it { _(form.errors.size).must_equal(2) }
   end
 
   describe "#validate with nested form using :base invalid" do
     it do
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal("band.name": ["you're a bad person"])
-      form.errors.size.must_equal(1)
+      _(result).must_equal false
+      _(form.errors.messages).must_equal("band.name": ["you're a bad person"])
+      _(form.errors.size).must_equal(1)
     end
   end
 
@@ -183,17 +183,17 @@ class ErrorsTest < MiniTest::Spec
       form.errors.add(:before, "validate 2")
       form.errors.add(:title, "before validate")
       result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"])
+      _(result).must_equal false
+      _(form.errors.messages).must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"])
       # add a new custom error
       form.errors.add(:policy, "error_text")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      _(form.errors.messages).must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
       # does not duplicate errors
       form.errors.add(:title, "must be filled")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
+      _(form.errors.messages).must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
       # merge existing errors
       form.errors.add(:policy, "another error")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
+      _(form.errors.messages).must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
     end
   end
 
@@ -207,14 +207,14 @@ class ErrorsTest < MiniTest::Spec
       )
     end
 
-    it { @result.must_equal true }
-    it { form.hit.title.must_equal "Sacrifice" }
-    it { form.title.must_equal "Second Heat" }
-    it { form.songs.first.title.must_equal "Heart Of A Lion" }
+    it { _(@result).must_equal true }
+    it { _(form.hit.title).must_equal "Sacrifice" }
+    it { _(form.title).must_equal "Second Heat" }
+    it { _(form.songs.first.title).must_equal "Heart Of A Lion" }
     it do
       skip "WE DON'T NEED COUNT AND EMPTY? ON THE CORE ERRORS OBJECT"
-      form.errors.size.must_equal(0)
-      form.errors.empty?.must_equal(true)
+      _(form.errors.size).must_equal(0)
+      _(form.errors.empty?).must_equal(true)
     end
   end
 
@@ -224,7 +224,7 @@ class ErrorsTest < MiniTest::Spec
     # to_s is aliased to messages
     it {
       skip "why do we need Errors#to_s ?"
-      form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
+      _(form.errors.to_s).must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
     }
   end
 end

data/test/feature_test.rb

@@ -45,8 +45,8 @@ class FeatureInheritanceTest < BaseTest
   let(:form) { AlbumForm.new(album) }
 
   it do
-    form.date.must_equal "May 16"
-    form.songs[0].date.must_equal "May 16"
+    _(form.date).must_equal "May 16"
+    _(form.songs[0].date).must_equal "May 16"
   end
 
   # it { subject.class.include?(Reform::Form::ActiveModel) }

data/test/form_new_api.rb

@@ -25,8 +25,8 @@ class FormTest < MiniTest::Spec
     let(:cloned) { AlbumForm.clone }
 
     # #dup is called in Op.inheritable_attr(:contract_class), it must be subclass of the original one.
-    it { cloned.wont_equal AlbumForm }
-    it { AlbumForm.definitions.wont_equal cloned.definitions }
+    it { _(cloned).wont_equal AlbumForm }
+    it { _(AlbumForm.definitions).wont_equal cloned.definitions }
 
     it do
       # currently, forms need a name for validation, even without AM.
@@ -51,7 +51,7 @@ class FormTest < MiniTest::Spec
     end
 
     it "allows injecting :virtual options" do
-      ArtistForm.new(Artist.new, current_user: Object).current_user.must_equal Object
+      _(ArtistForm.new(Artist.new, current_user: Object).current_user).must_equal Object
     end
   end
 end

data/test/form_old_api.rb

@@ -25,8 +25,8 @@ class FormTest < MiniTest::Spec
     let(:cloned) { AlbumForm.clone }
 
     # #dup is called in Op.inheritable_attr(:contract_class), it must be subclass of the original one.
-    it { cloned.wont_equal AlbumForm }
-    it { AlbumForm.definitions.wont_equal cloned.definitions }
+    it { _(cloned).wont_equal AlbumForm }
+    it { _(AlbumForm.definitions).wont_equal cloned.definitions }
 
     it do
       # currently, forms need a name for validation, even without AM.
@@ -51,7 +51,7 @@ class FormTest < MiniTest::Spec
     end
 
     it "allows injecting :virtual options" do
-      ArtistForm.new(Artist.new, current_user: Object).current_user.must_equal Object
+      _(ArtistForm.new(Artist.new, current_user: Object).current_user).must_equal Object
     end
   end
 end

data/test/form_option_new_api.rb

@@ -17,7 +17,7 @@ class FormOptionTest < MiniTest::Spec
 
   it do
     form = AlbumForm.new(Album.new(Song.new("When It Comes To You")))
-    form.song.title.must_equal "When It Comes To You"
+    _(form.song.title).must_equal "When It Comes To You"
 
     form.validate(song: {title: "Run For Cover"})
   end

data/test/form_option_old_api.rb

@@ -17,7 +17,7 @@ class FormOptionTest < MiniTest::Spec
 
   it do
     form = AlbumForm.new(Album.new(Song.new("When It Comes To You")))
-    form.song.title.must_equal "When It Comes To You"
+    _(form.song.title).must_equal "When It Comes To You"
 
     form.validate(song: {title: "Run For Cover"})
   end