enumerize 2.4.0 → 2.6.0

data/test/multiple_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Base do
+class MultipleTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize
@@ -17,38 +17,38 @@ describe Enumerize::Base do
 
   it 'returns [] when not set' do
     kklass.enumerize :foos, in: %w(a b), multiple: true
-    object.foos.must_equal []
+    expect(object.foos).must_equal []
   end
 
   it 'returns setted array' do
     kklass.enumerize :foos, in: %w(a b c), multiple: true
     object.foos = %w(a c)
-    object.foos.must_equal %w(a c)
+    expect(object.foos).must_equal %w(a c)
   end
 
   it 'sets default value as single value' do
     kklass.enumerize :foos, in: %w(a b c), default: 'b', multiple: true
-    object.foos.must_equal %w(b)
+    expect(object.foos).must_equal %w(b)
   end
 
   it 'sets default value as array of one element' do
     kklass.enumerize :foos, in: %w(a b c), default: %w(b), multiple: true
-    object.foos.must_equal %w(b)
+    expect(object.foos).must_equal %w(b)
   end
 
   it 'sets default value as array of several elements' do
     kklass.enumerize :foos, in: %w(a b c), default: %w(b c), multiple: true
-    object.foos.must_equal %w(b c)
+    expect(object.foos).must_equal %w(b c)
   end
 
   it "doesn't define _text method" do
     kklass.enumerize :foos, in: %w(a b c), multiple: true
-    object.wont_respond_to :foos_text
+    expect(object).wont_respond_to :foos_text
   end
 
   it "doesn't define _value method" do
     kklass.enumerize :foos, in: %w(a b c), multiple: true
-    object.wont_respond_to :foos_value
+    expect(object).wont_respond_to :foos_value
   end
 
   it "cannot define multiple with scope" do
@@ -60,6 +60,6 @@ describe Enumerize::Base do
   it 'assign a name with the first letter capitalized' do
     kklass.enumerize :Foos, in: %w(a b c), multiple: true
     object.Foos = %w(a c)
-    object.Foos.must_equal %w(a c)
+    expect(object.Foos).must_equal %w(a c)
   end
 end

data/test/predicates_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-describe Enumerize::Predicates do
+class PredicatesTest < MiniTest::Spec
   let(:kklass) do
     Class.new do
       extend Enumerize
@@ -13,53 +13,53 @@ describe Enumerize::Predicates do
 
   it 'creates predicate methods' do
     kklass.enumerize(:foo, in: %w(a b), predicates: true)
-    object.must_respond_to :a?
-    object.must_respond_to :b?
+    expect(object).must_respond_to :a?
+    expect(object).must_respond_to :b?
   end
 
   it 'creates predicate methods when enumerized values have dash in it' do
     kklass.enumerize(:foo, in: %w(foo-bar bar-foo), predicates: true)
-    object.must_respond_to :foo_bar?
-    object.must_respond_to :bar_foo?
+    expect(object).must_respond_to :foo_bar?
+    expect(object).must_respond_to :bar_foo?
   end
 
   it 'creates predicate methods on multiple attribute' do
     kklass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
-    object.must_respond_to :a?
-    object.must_respond_to :b?
+    expect(object).must_respond_to :a?
+    expect(object).must_respond_to :b?
   end
 
   it 'checks values' do
     kklass.enumerize(:foo, in: %w(a b), predicates: true)
     object.foo = 'a'
-    object.a?.must_equal true
-    object.b?.must_equal false
+    expect(object.a?).must_equal true
+    expect(object.b?).must_equal false
   end
 
   it 'checks values on multiple attribute' do
     kklass.enumerize(:foo, in: %w(a b), predicates: true, multiple: true)
     object.foo << :a
-    object.a?.must_equal true
-    object.b?.must_equal false
+    expect(object.a?).must_equal true
+    expect(object.b?).must_equal false
   end
 
   it 'prefixes methods' do
     kklass.enumerize(:foo, in: %w(a b), predicates: { prefix: 'bar' })
-    object.wont_respond_to :a?
-    object.wont_respond_to :b?
-    object.must_respond_to :bar_a?
-    object.must_respond_to :bar_b?
+    expect(object).wont_respond_to :a?
+    expect(object).wont_respond_to :b?
+    expect(object).must_respond_to :bar_a?
+    expect(object).must_respond_to :bar_b?
   end
 
   it 'accepts only option' do
     kklass.enumerize(:foo, in: %w(a b), predicates: { only: :a })
-    object.must_respond_to :a?
-    object.wont_respond_to :b?
+    expect(object).must_respond_to :a?
+    expect(object).wont_respond_to :b?
   end
 
   it 'accepts except option' do
     kklass.enumerize(:foo, in: %w(a b), predicates: { except: :a })
-    object.wont_respond_to :a?
-    object.must_respond_to :b?
+    expect(object).wont_respond_to :a?
+    expect(object).must_respond_to :b?
   end
 end

data/test/rails_admin_test.rb

@@ -14,14 +14,14 @@ class RailsAdminSpec < MiniTest::Spec
   it 'defines enum method' do
     store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do
       kklass.enumerize(:foo, in: [:a, :b])
-      object.foo_enum.must_equal [['a text', 'a'], ['b text', 'b']]
+      expect(object.foo_enum).must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
 
   it 'defines enum properly for custom values enumerations' do
     store_translations(:en, :enumerize => {:foo => {:a => 'a text', :b => 'b text'}}) do
       kklass.enumerize(:foo, in: {:a => 1, :b => 2})
-      object.foo_enum.must_equal [['a text', 'a'], ['b text', 'b']]
+      expect(object.foo_enum).must_equal [['a text', 'a'], ['b text', 'b']]
     end
   end
 end

data/test/sequel_test.rb

@@ -5,7 +5,7 @@ require 'sequel'
 require 'logger'
 require 'jdbc/sqlite3' if RUBY_PLATFORM == 'java'
 
-module SequelTest
+class SequelTest < MiniTest::Spec
   silence_warnings do
     DB = if RUBY_PLATFORM == 'java'
       Sequel.connect('jdbc:sqlite::memory:')
@@ -89,253 +89,254 @@ module SequelTest
     include SkipValidationsLambdaWithParamEnum
   end
 
-  describe Enumerize::SequelSupport do
-    it 'sets nil if invalid value is passed' do
-      user = User.new
-      user.sex = :invalid
-      user.sex.must_be_nil
-    end
+  it 'sets nil if invalid value is passed' do
+    user = User.new
+    user.sex = :invalid
+    expect(user.sex).must_be_nil
+  end
 
-    it 'saves value' do
-      User.filter{ true }.delete
-      user = User.new
-      user.sex = :female
-      user.save
-      user.sex.must_equal 'female'
-    end
+  it 'saves value' do
+    User.filter{ true }.delete
+    user = User.new
+    user.sex = :female
+    user.save
+    expect(user.sex).must_equal 'female'
+  end
 
-    it 'loads value' do
-      User.filter{ true }.delete
-      User.create(:sex => :male)
-      store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
-        user = User.first
-        user.sex.must_equal 'male'
-        user.sex_text.must_equal 'Male'
-      end
+  it 'loads value' do
+    User.filter{ true }.delete
+    User.create(:sex => :male)
+    store_translations(:en, :enumerize => {:sex => {:male => 'Male'}}) do
+      user = User.first
+      expect(user.sex).must_equal 'male'
+      expect(user.sex_text).must_equal 'Male'
     end
+  end
 
-    it 'has default value' do
-      User.new.role.must_equal 'user'
-      User.new.values[:role].must_equal 'user'
-    end
+  it 'has default value' do
+    expect(User.new.role).must_equal 'user'
+    expect(User.new.values[:role]).must_equal 'user'
+  end
 
-    it 'does not set default value for not selected attributes' do
-      User.filter{ true }.delete
-      User.create(:sex => :male)
+  it 'does not set default value for not selected attributes' do
+    User.filter{ true }.delete
+    User.create(:sex => :male)
 
-      assert_equal [:id], User.select(:id).first.values.keys
-    end
+    assert_equal [:id], User.select(:id).first.values.keys
+  end
 
-    it 'has default value with lambda' do
-      User.new.lambda_role.must_equal 'admin'
-      User.new.values[:lambda_role].must_equal 'admin'
-    end
-    it 'uses after_initialize callback to set default value' do
-      User.filter{ true }.delete
-      User.create(sex: 'male', lambda_role: nil)
+  it 'has default value with lambda' do
+    expect(User.new.lambda_role).must_equal 'admin'
+    expect(User.new.values[:lambda_role]).must_equal 'admin'
+  end
+  it 'uses after_initialize callback to set default value' do
+    User.filter{ true }.delete
+    User.create(sex: 'male', lambda_role: nil)
 
-      user = User.where(:sex => 'male').first
-      user.lambda_role.must_equal 'admin'
-    end
+    user = User.where(:sex => 'male').first
+    expect(user.lambda_role).must_equal 'admin'
+  end
 
-    it 'uses default value from db column' do
-      User.new.account_type.must_equal 'basic'
-    end
+  it 'uses default value from db column' do
+    expect(User.new.account_type).must_equal 'basic'
+  end
 
-    it 'validates inclusion' do
-      user = User.new
-      user.role = 'wrong'
-      user.wont_be :valid?
-      user.errors[:role].must_include 'is not included in the list'
-    end
+  it 'validates inclusion' do
+    user = User.new
+    user.role = 'wrong'
+    expect(user).wont_be :valid?
+    expect(user.errors[:role]).must_include 'is not included in the list'
+  end
 
-    it 'validates inclusion on mass assignment' do
-      assert_raises Sequel::ValidationFailed do
-        User.create(role: 'wrong')
-      end
+  it 'validates inclusion on mass assignment' do
+    assert_raises Sequel::ValidationFailed do
+      User.create(role: 'wrong')
     end
+  end
 
-    it "uses persisted value for validation if it hasn't been set" do
-      user = User.create :sex => :male
-      User[user.id].read_attribute_for_validation(:sex).must_equal 'male'
-    end
+  it "uses persisted value for validation if it hasn't been set" do
+    user = User.create :sex => :male
+    expect(User[user.id].read_attribute_for_validation(:sex)).must_equal 'male'
+  end
 
-    it 'is valid with empty string assigned' do
-      user = User.new
-      user.role = ''
-      user.must_be :valid?
-    end
+  it 'is valid with empty string assigned' do
+    user = User.new
+    user.role = ''
+    expect(user).must_be :valid?
+  end
 
-    it 'stores nil when empty string assigned' do
-      user = User.new
-      user.role = ''
-      user.values[:role].must_be_nil
-    end
+  it 'stores nil when empty string assigned' do
+    user = User.new
+    user.role = ''
+    expect(user.values[:role]).must_be_nil
+  end
 
-    it 'validates inclusion when :skip_validations = false' do
-      user = DoNotSkipValidationsUser.new
-      user.foo = 'wrong'
-      user.wont_be :valid?
-      user.errors[:foo].must_include 'is not included in the list'
-    end
+  it 'validates inclusion when :skip_validations = false' do
+    user = DoNotSkipValidationsUser.new
+    user.foo = 'wrong'
+    expect(user).wont_be :valid?
+    expect(user.errors[:foo]).must_include 'is not included in the list'
+  end
 
-    it 'does not validate inclusion when :skip_validations = true' do
-      user = SkipValidationsUser.new
-      user.foo = 'wrong'
-      user.must_be :valid?
-    end
+  it 'does not validate inclusion when :skip_validations = true' do
+    user = SkipValidationsUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports :skip_validations option as lambda' do
-      user = SkipValidationsLambdaUser.new
-      user.foo = 'wrong'
-      user.must_be :valid?
-    end
+  it 'supports :skip_validations option as lambda' do
+    user = SkipValidationsLambdaUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports :skip_validations option as lambda with a parameter' do
-      user = SkipValidationsLambdaWithParamUser.new
-      user.foo = 'wrong'
-      user.must_be :valid?
-    end
+  it 'supports :skip_validations option as lambda with a parameter' do
+    user = SkipValidationsLambdaWithParamUser.new
+    user.foo = 'wrong'
+    expect(user).must_be :valid?
+  end
 
-    it 'supports multiple attributes' do
-      user = User.new
-      user.interests ||= []
-      user.interests.must_be_empty
-      user.interests << "music"
-      user.interests.must_equal %w(music)
-      user.save
-
-      user = User[user.id]
-      user.interests.must_be_instance_of Enumerize::Set
-      user.interests.must_equal %w(music)
-      user.interests << "sports"
-      user.interests.must_equal %w(music sports)
-
-      user.interests = []
-      interests = user.interests
-      interests << "music"
-      interests.must_equal %w(music)
-      interests << "dancing"
-      interests.must_equal %w(music dancing)
-    end
+  it 'supports multiple attributes' do
+    user = User.new
+    user.interests ||= []
+    expect(user.interests).must_be_empty
+    user.interests << "music"
+    expect(user.interests).must_equal %w(music)
+    user.save
+
+    user = User[user.id]
+    expect(user.interests).must_be_instance_of Enumerize::Set
+    expect(user.interests).must_equal %w(music)
+    user.interests << "sports"
+    expect(user.interests).must_equal %w(music sports)
+
+    user.interests = []
+    interests = user.interests
+    interests << "music"
+    expect(interests).must_equal %w(music)
+    interests << "dancing"
+    expect(interests).must_equal %w(music dancing)
+  end
 
-    it 'returns invalid multiple value for validation' do
-      user = User.new
-      user.interests << :music
-      user.interests << :invalid
-      values = user.read_attribute_for_validation(:interests)
-      values.must_equal %w(music invalid)
-    end
+  it 'returns invalid multiple value for validation' do
+    user = User.new
+    user.interests << :music
+    user.interests << :invalid
+    values = user.read_attribute_for_validation(:interests)
+    expect(values).must_equal %w(music invalid)
+  end
 
-    it 'validates multiple attributes' do
-      user = User.new
-      user.interests << :invalid
-      user.wont_be :valid?
+  it 'validates multiple attributes' do
+    user = User.new
+    user.interests << :invalid
+    expect(user).wont_be :valid?
 
-      user.interests = Object.new
-      user.wont_be :valid?
+    user.interests = Object.new
+    expect(user).wont_be :valid?
 
-      user.interests = ['music', '']
-      user.must_be :valid?
-    end
+    user.interests = ['music', '']
+    expect(user).must_be :valid?
+  end
 
-    it 'stores custom values for multiple attributes' do
-      User.filter{ true }.delete
+  it 'stores custom values for multiple attributes' do
+    User.filter{ true }.delete
 
-      klass = Class.new(User)
-      klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
+    klass = Class.new(User)
+    klass.enumerize :interests, in: { music: 0, sports: 1, dancing: 2, programming: 3}, multiple: true
 
-      user = klass.new
-      user.interests << :music
-      user.interests.must_equal %w(music)
-      user.save
+    user = klass.new
+    user.interests << :music
+    expect(user.interests).must_equal %w(music)
+    user.save
 
-      user = klass[user.id]
-      user.interests.must_equal %w(music)
-    end
+    user = klass[user.id]
+    expect(user.interests).must_equal %w(music)
+  end
 
-    it 'adds scope' do
-      User.filter{ true }.delete
+  it 'adds scope' do
+    User.filter{ true }.delete
 
-      user_1 = User.create(status: :active, role: :admin)
-      user_2 = User.create(status: :blocked)
-      user_3 = User.create(sex: :male, skill: :pro)
+    user_1 = User.create(sex: :female, skill: :noob, status: :active, role: :admin)
+    user_2 = User.create(sex: :female, skill: :casual, status: :blocked)
+    user_3 = User.create(sex: :male, skill: :pro)
 
-      User.with_status(:active).to_a.must_equal [user_1]
-      User.with_status(:blocked).to_a.must_equal [user_2]
-      User.with_status(:active, :blocked).to_set.must_equal [user_1, user_2].to_set
+    expect(User.with_status(:active).to_a).must_equal [user_1]
+    expect(User.with_status(:blocked).to_a).must_equal [user_2]
+    expect(User.with_status(:active, :blocked).to_set).must_equal [user_1, user_2].to_set
 
-      User.without_status(:active).to_a.must_equal [user_2]
-      User.without_status(:active, :blocked).to_a.must_equal []
+    expect(User.without_status(:active).to_a).must_equal [user_2]
+    expect(User.without_status(:active, :blocked).to_a).must_equal []
 
-      User.having_role(:admin).to_a.must_equal [user_1]
-      User.male.to_a.must_equal [user_3]
-      User.pro.to_a.must_equal [user_3]
-    end
+    expect(User.having_role(:admin).to_a).must_equal [user_1]
+    expect(User.male.to_a).must_equal [user_3]
+    expect(User.pro.to_a).must_equal [user_3]
 
-    it 'allows either key or value as valid' do
-      user_1 = User.new(status: :active)
-      user_2 = User.new(status: 1)
-      user_3 = User.new(status: '1')
+    expect(User.not_male.to_set).must_equal [user_1, user_2].to_set
+    expect(User.not_pro.to_set).must_equal [user_1, user_2].to_set
+  end
 
-      user_1.status.must_equal 'active'
-      user_2.status.must_equal 'active'
-      user_3.status.must_equal 'active'
+  it 'allows either key or value as valid' do
+    user_1 = User.new(status: :active)
+    user_2 = User.new(status: 1)
+    user_3 = User.new(status: '1')
 
-      user_1.must_be :valid?
-      user_2.must_be :valid?
-      user_3.must_be :valid?
-    end
+    expect(user_1.status).must_equal 'active'
+    expect(user_2.status).must_equal 'active'
+    expect(user_3.status).must_equal 'active'
 
-    it 'supports defining enumerized attributes on abstract class' do
-      Document.filter{ true }.delete
+    expect(user_1).must_be :valid?
+    expect(user_2).must_be :valid?
+    expect(user_3).must_be :valid?
+  end
 
-      document = Document.new
-      document.visibility = :protected
-      document.visibility.must_equal 'protected'
-    end
+  it 'supports defining enumerized attributes on abstract class' do
+    Document.filter{ true }.delete
 
-    it 'supports defining enumerized scopes on abstract class' do
-      Document.filter{ true }.delete
+    document = Document.new
+    document.visibility = :protected
+    expect(document.visibility).must_equal 'protected'
+  end
 
-      document_1 = Document.create(visibility: :public)
-      document_2 = Document.create(visibility: :private)
+  it 'supports defining enumerized scopes on abstract class' do
+    Document.filter{ true }.delete
 
-      Document.with_visibility(:public).to_a.must_equal [document_1]
-    end
+    document_1 = Document.create(visibility: :public)
+    document_2 = Document.create(visibility: :private)
 
-    it 'validates uniqueness' do
-      user = User.create(status: :active, sex: "male")
+    expect(Document.with_visibility(:public).to_a).must_equal [document_1]
+  end
 
-      user = UniqStatusUser.new
-      user.sex = "male"
-      user.status = :active
-      user.valid?.must_equal false
+  it 'validates uniqueness' do
+    user = User.create(status: :active, sex: "male")
 
-      user.errors[:status].wont_be :empty?
-    end
+    user = UniqStatusUser.new
+    user.sex = "male"
+    user.status = :active
+    expect(user.valid?).must_equal false
 
-    it "doesn't update record" do
-      Document.filter{ true }.delete
+    expect(user.errors[:status]).wont_be :empty?
+  end
 
-      expected = Time.new(2010, 10, 10)
+  it "doesn't update record" do
+    Document.filter{ true }.delete
 
-      document = Document.new
-      document.updated_at = expected
-      document.save
+    expected = Time.new(2010, 10, 10)
 
-      document = Document.last
-      document.save
+    document = Document.new
+    document.updated_at = expected
+    document.save
 
-      assert_equal expected, document.updated_at
-    end
+    document = Document.last
+    document.save
 
-    it 'changes from dirty should be serialized as scalar values' do
-      user = User.create(:status => :active)
-      user.status = :blocked
+    assert_equal expected, document.updated_at
+  end
 
-      expected = { status: [1, 2] }.to_yaml
-      assert_equal expected, user.column_changes.to_yaml
-    end
+  it 'changes from dirty should be serialized as scalar values' do
+    user = User.create(:status => :active)
+    user.status = :blocked
+
+    expected = { status: [1, 2] }.to_yaml
+    assert_equal expected, user.column_changes.to_yaml
   end
 end