reform 2.3.0.rc1 → 2.5.0

data/test/populator_skip_test.rb

@@ -4,7 +4,6 @@ class PopulatorSkipTest < MiniTest::Spec
   Album = Struct.new(:songs)
   Song  = Struct.new(:title)
 
-
   class AlbumForm < TestForm
     collection :songs, populator: :my_populator do
       property :title
@@ -22,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
+end

data/test/prepopulator_test.rb

@@ -1,17 +1,17 @@
-require 'test_helper'
+require "test_helper"
 
 class PrepopulatorTest < MiniTest::Spec
   Song = Struct.new(:title, :band, :length)
   Band = Struct.new(:name)
 
   class AlbumForm < TestForm
-    property :title, prepopulator: ->(*){ self.title = "Another Day At Work" }                  # normal assignment.
+    property :title, prepopulator: ->(*) { self.title = "Another Day At Work" }                  # normal assignment.
     property :length
 
     property :hit, prepopulator: ->(options) { self.hit = Song.new(options[:title]) } do # use user options.
       property :title
 
-      property :band, prepopulator: ->(options){ self.band = my_band(options[:title]) } do                             # invoke your own code.
+      property :band, prepopulator: ->(options) { self.band = my_band(options[:title]) } do                             # invoke your own code.
         property :name
       end
 
@@ -24,7 +24,7 @@ class PrepopulatorTest < MiniTest::Spec
         property :title
     end
 
-  private
+    private
     def prepopulate_songs!(options)
       if songs == nil
         self.songs = [Song.new, Song.new]
@@ -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,10 +75,9 @@ 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
   Song = Struct.new(:title, :band, :length)
   Band = Struct.new(:name)
@@ -105,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
+end

data/test/read_only_test.rb

@@ -1,3 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
+class ReadonlyTest < MiniTest::Spec
+  class SongForm < TestForm
+    property :artist
+    property :title, writeable: false
+    # TODO: what to do with virtual values?
+  end
 
+  let(:form) { SongForm.new(OpenStruct.new) }
+
+  it { refute form.readonly?(:artist) }
+  it { assert form.readonly?(:title) }
+end

data/test/readable_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class ReadableTest < MiniTest::Spec
   Credentials = Struct.new(:password)
@@ -7,24 +7,24 @@ class ReadableTest < MiniTest::Spec
     property :password, readable: false
   end
 
-  let (:cred) { Credentials.new }
-  let (:form) { PasswordForm.new(cred) }
+  let(:cred) { Credentials.new }
+  let(:form) { PasswordForm.new(cred) }
 
   it {
     assert_nil form.password # password not read.
 
     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
+end

data/test/reform_test.rb

@@ -1,26 +1,25 @@
-require 'test_helper'
+require "test_helper"
 
-# TODO: this test should be removed.
 class ReformTest < Minitest::Spec
-  let (:comp) { OpenStruct.new(:name => "Duran Duran", :title => "Rio") }
+  let(:comp) { OpenStruct.new(name: "Duran Duran", title: "Rio") }
 
-  let (:form) { SongForm.new(comp) }
+  let(:form) { SongForm.new(comp) }
 
   class SongForm < TestForm
     property :name
     property :title
 
     validation do
-      required(:name).filled
+      params { required(:name).filled }
     end
   end
 
   describe "(new) form with empty models" do
-    let (:comp) { OpenStruct.new }
+    let(:comp) { OpenStruct.new }
 
     it "returns empty fields" do
       assert_nil form.title
-      form.name.must_equal  nil
+      assert_nil form.name
     end
 
     describe "and submitted values" do
@@ -28,20 +27,20 @@ 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
 
   describe "#validate" do
-    let (:comp) { OpenStruct.new }
+    let(:comp) { OpenStruct.new }
 
     it "ignores unmapped fields in input" do
       form.validate("name" => "Duran Duran", :genre => "80s")
@@ -51,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
@@ -73,33 +72,35 @@ class ReformTest < Minitest::Spec
         property :title
 
         validation do
-          required(:name).filled
-          required(:title).filled
+          params do
+            required(:name).filled
+            required(:title).filled
+          end
         end
       end
-      let (:form) { ValidatingForm.new(comp) }
+      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
 
   describe "#save" do
-    let (:comp) { OpenStruct.new }
-    let (:form) { SongForm.new(comp) }
+    let(:comp) { OpenStruct.new }
+    let(:form) { SongForm.new(comp) }
 
     before { form.validate("name" => "Diesel Boy") }
 
     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
 
@@ -111,42 +112,39 @@ 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
     class HitForm < SongForm
       property :position
       validation do
-        required(:position).filled
+        params { required(:position).filled }
       end
     end
 
-    let (:form) { HitForm.new(OpenStruct.new()) }
+    let(:form) { HitForm.new(OpenStruct.new()) }
     it do
-      form.validate({"title" => "The Body"})
-      form.title.must_equal "The Body"
+      form.validate("title" => "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
 
-
 class OverridingAccessorsTest < BaseTest
   class SongForm < TestForm
     property :title
 
     def title=(v) # used in #validate.
-      super v*2
+      super v * 2
     end
 
     def title # used in #sync.
@@ -154,23 +152,22 @@ class OverridingAccessorsTest < BaseTest
     end
   end
 
-  let (:song) { Song.new("Pray") }
+  let(:song) { Song.new("Pray") }
   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
 
@@ -178,12 +175,11 @@ 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
 
-
 class MethodInFormTest < MiniTest::Spec
   class AlbumForm < TestForm
     property :title
@@ -202,7 +198,7 @@ class MethodInFormTest < MiniTest::Spec
   end
 
   # 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" }
+  subject { AlbumForm.new(OpenStruct.new(hit: OpenStruct.new)) }
+  it { assert_equal subject.title, "The Suffer And The Witness" }
+  it { assert_equal subject.hit.title, "Drones" }
 end

data/test/save_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class SaveTest < BaseTest
   Song  = Struct.new(:title, :album, :composer)
@@ -8,19 +8,19 @@ class SaveTest < BaseTest
   class AlbumForm < TestForm
     property :name
     validation do
-      required(:name).filled
+      params { required(:name).filled }
     end
 
     collection :songs do
       property :title
       validation do
-        required(:title).filled
+        params { required(:title).filled }
       end
 
       property :composer do
         property :name
         validation do
-          required(:name).filled
+          params { required(:name).filled }
         end
       end
     end
@@ -40,24 +40,22 @@ class SaveTest < BaseTest
     end
   end
 
+  let(:song)               { Song.new("Broken").extend(Saveable) }
+  # let(:song_with_composer) { Song.new("Resist Stance", nil, composer).extend(Saveable) }
+  let(:composer)           { Artist.new("Greg Graffin").extend(Saveable) }
+  let(:artist)             { Artist.new("Bad Religion").extend(Saveable).extend(Saveable) }
+  let(:album)              { Album.new("The Dissent Of Man", [song], artist).extend(Saveable) }
 
-  let (:song)               { Song.new("Broken").extend(Saveable) }
-  # let (:song_with_composer) { Song.new("Resist Stance", nil, composer).extend(Saveable) }
-  let (:composer)           { Artist.new("Greg Graffin").extend(Saveable) }
-  let (:artist)             { Artist.new("Bad Religion").extend(Saveable).extend(Saveable) }
-  let (:album)              { Album.new("The Dissent Of Man", [song], artist).extend(Saveable) }
-
-  let (:form) { AlbumForm.new(album) }
-
+  let(:form) { AlbumForm.new(album) }
 
   it do
     form.validate("songs" => [{"title" => "Fixed"}])
 
     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
 
@@ -72,12 +70,11 @@ 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
 
-
 # class SaveWithDynamicOptionsTest < MiniTest::Spec
 #   Song = Struct.new(:id, :title, :length) do
 #     include Saveable
@@ -88,8 +85,8 @@ end
 #     property :length, virtual: true
 #   end
 
-#   let (:song) { Song.new }
-#   let (:form) { SongForm.new(song) }
+#   let(:song) { Song.new }
+#   let(:form) { SongForm.new(song) }
 
 #   # we have access to original input value and outside parameters.
 #   it "xxx" do