enumerize 2.4.0 → 2.5.0

data/test/predicates_test.rb

@@ -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

@@ -93,7 +93,7 @@ module SequelTest
     it 'sets nil if invalid value is passed' do
       user = User.new
       user.sex = :invalid
-      user.sex.must_be_nil
+      expect(user.sex).must_be_nil
     end
 
     it 'saves value' do
@@ -101,7 +101,7 @@ module SequelTest
       user = User.new
       user.sex = :female
       user.save
-      user.sex.must_equal 'female'
+      expect(user.sex).must_equal 'female'
     end
 
     it 'loads value' do
@@ -109,14 +109,14 @@ module SequelTest
       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'
+        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'
+      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
@@ -127,26 +127,26 @@ module SequelTest
     end
 
     it 'has default value with lambda' do
-      User.new.lambda_role.must_equal 'admin'
-      User.new.values[:lambda_role].must_equal 'admin'
+      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'
+      expect(user.lambda_role).must_equal 'admin'
     end
 
     it 'uses default value from db column' do
-      User.new.account_type.must_equal 'basic'
+      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'
+      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
@@ -157,66 +157,66 @@ module SequelTest
 
     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'
+      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?
+      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
+      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'
+      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?
+      expect(user).must_be :valid?
     end
 
     it 'supports :skip_validations option as lambda' do
       user = SkipValidationsLambdaUser.new
       user.foo = 'wrong'
-      user.must_be :valid?
+      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?
+      expect(user).must_be :valid?
     end
 
     it 'supports multiple attributes' do
       user = User.new
       user.interests ||= []
-      user.interests.must_be_empty
+      expect(user.interests).must_be_empty
       user.interests << "music"
-      user.interests.must_equal %w(music)
+      expect(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)
+      expect(user.interests).must_be_instance_of Enumerize::Set
+      expect(user.interests).must_equal %w(music)
       user.interests << "sports"
-      user.interests.must_equal %w(music sports)
+      expect(user.interests).must_equal %w(music sports)
 
       user.interests = []
       interests = user.interests
       interests << "music"
-      interests.must_equal %w(music)
+      expect(interests).must_equal %w(music)
       interests << "dancing"
-      interests.must_equal %w(music dancing)
+      expect(interests).must_equal %w(music dancing)
     end
 
     it 'returns invalid multiple value for validation' do
@@ -224,19 +224,19 @@ module SequelTest
       user.interests << :music
       user.interests << :invalid
       values = user.read_attribute_for_validation(:interests)
-      values.must_equal %w(music invalid)
+      expect(values).must_equal %w(music invalid)
     end
 
     it 'validates multiple attributes' do
       user = User.new
       user.interests << :invalid
-      user.wont_be :valid?
+      expect(user).wont_be :valid?
 
       user.interests = Object.new
-      user.wont_be :valid?
+      expect(user).wont_be :valid?
 
       user.interests = ['music', '']
-      user.must_be :valid?
+      expect(user).must_be :valid?
     end
 
     it 'stores custom values for multiple attributes' do
@@ -247,30 +247,33 @@ module SequelTest
 
       user = klass.new
       user.interests << :music
-      user.interests.must_equal %w(music)
+      expect(user.interests).must_equal %w(music)
       user.save
 
       user = klass[user.id]
-      user.interests.must_equal %w(music)
+      expect(user.interests).must_equal %w(music)
     end
 
     it 'adds scope' do
       User.filter{ true }.delete
 
-      user_1 = User.create(status: :active, role: :admin)
-      user_2 = User.create(status: :blocked)
+      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]
+      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]
+
+      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
 
     it 'allows either key or value as valid' do
@@ -278,13 +281,13 @@ module SequelTest
       user_2 = User.new(status: 1)
       user_3 = User.new(status: '1')
 
-      user_1.status.must_equal 'active'
-      user_2.status.must_equal 'active'
-      user_3.status.must_equal 'active'
+      expect(user_1.status).must_equal 'active'
+      expect(user_2.status).must_equal 'active'
+      expect(user_3.status).must_equal 'active'
 
-      user_1.must_be :valid?
-      user_2.must_be :valid?
-      user_3.must_be :valid?
+      expect(user_1).must_be :valid?
+      expect(user_2).must_be :valid?
+      expect(user_3).must_be :valid?
     end
 
     it 'supports defining enumerized attributes on abstract class' do
@@ -292,7 +295,7 @@ module SequelTest
 
       document = Document.new
       document.visibility = :protected
-      document.visibility.must_equal 'protected'
+      expect(document.visibility).must_equal 'protected'
     end
 
     it 'supports defining enumerized scopes on abstract class' do
@@ -301,7 +304,7 @@ module SequelTest
       document_1 = Document.create(visibility: :public)
       document_2 = Document.create(visibility: :private)
 
-      Document.with_visibility(:public).to_a.must_equal [document_1]
+      expect(Document.with_visibility(:public).to_a).must_equal [document_1]
     end
 
     it 'validates uniqueness' do
@@ -310,9 +313,9 @@ module SequelTest
       user = UniqStatusUser.new
       user.sex = "male"
       user.status = :active
-      user.valid?.must_equal false
+      expect(user.valid?).must_equal false
 
-      user.errors[:status].wont_be :empty?
+      expect(user.errors[:status]).wont_be :empty?
     end
 
     it "doesn't update record" do

data/test/set_test.rb

@@ -41,36 +41,36 @@ describe Enumerize::Set do
   end
 
   it 'equals to other set' do
-    set.must_equal Enumerize::Set.new(nil, kklass.foo, %w(a))
+    expect(set).must_equal Enumerize::Set.new(nil, kklass.foo, %w(a))
   end
 
   it 'equals to array' do
-    set.must_equal %w(a)
+    expect(set).must_equal %w(a)
   end
 
   it 'equals to array of symbols' do
-    set.must_equal [:a]
+    expect(set).must_equal [:a]
   end
 
   it 'has unique values' do
     set << :a
-    set.must_equal %w(a)
+    expect(set).must_equal %w(a)
   end
 
   it 'equals to array with different value order' do
     set << :b
-    set.must_equal %w(b a)
+    expect(set).must_equal %w(b a)
   end
 
   it "isn't equal to a part of values" do
     set << :b
-    set.wont_equal %w(a)
+    expect(set).wont_equal %w(a)
   end
 
   describe '#push' do
     it 'appends values' do
       set.push :b
-      set.must_include :b
+      expect(set).must_include :b
     end
 
     it 'reassigns attribute' do
@@ -83,7 +83,7 @@ describe Enumerize::Set do
   describe '#delete' do
     it 'deletes value' do
       set.delete :a
-      set.wont_include :a
+      expect(set).wont_include :a
     end
 
     it 'reassigns attribute' do
@@ -96,64 +96,64 @@ describe Enumerize::Set do
   describe '#inspect' do
     it 'returns custom string' do
       set << :b
-      set.inspect.must_equal '#<Enumerize::Set {a, b}>'
+      expect(set.inspect).must_equal '#<Enumerize::Set {a, b}>'
     end
   end
 
   describe '#to_ary' do
     it 'returns array' do
-      set.to_ary.must_be_instance_of Array
+      expect(set.to_ary).must_be_instance_of Array
     end
   end
 
   describe '#texts' do
     it 'returns array of text values' do
-      set.texts.must_equal ['A']
+      expect(set.texts).must_equal ['A']
     end
   end
 
   describe '#join' do
     it 'joins values' do
       set << :b
-      set.join(', ').must_equal 'a, b'
+      expect(set.join(', ')).must_equal 'a, b'
     end
   end
 
   describe 'boolean methods comparison' do
     it 'returns true if value equals method' do
       set << :a
-      set.a?.must_equal true
+      expect(set.a?).must_equal true
     end
 
     it 'returns false if value does not equal method' do
       set << :a
-      set.b?.must_equal false
+      expect(set.b?).must_equal false
     end
 
     it 'raises NoMethodError if there are no values like boolean method' do
-      proc {
+      expect(proc {
         set.some_method?
-      }.must_raise NoMethodError
+      }).must_raise NoMethodError
     end
 
     it 'raises ArgumentError if arguments are passed' do
-      proc {
+      expect(proc {
         set.a?('<3')
-      }.must_raise ArgumentError
+      }).must_raise ArgumentError
     end
 
     it 'responds to methods for existing values' do
-      set.must_respond_to :a?
-      set.must_respond_to :b?
-      set.must_respond_to :c?
+      expect(set).must_respond_to :a?
+      expect(set).must_respond_to :b?
+      expect(set).must_respond_to :c?
     end
 
     it 'returns a method object' do
-      set.method(:a?).must_be_instance_of Method
+      expect(set.method(:a?)).must_be_instance_of Method
     end
 
     it 'does not respond to a method for not existing value' do
-      set.wont_respond_to :some_method?
+      expect(set).wont_respond_to :some_method?
     end
   end
 

data/test/value_test.rb

@@ -14,36 +14,36 @@ describe Enumerize::Value do
   let(:val) { Enumerize::Value.new(attr, 'test_value', 1) }
 
   it 'is a string' do
-    val.must_be_kind_of String
+    expect(val).must_be_kind_of String
   end
 
   describe 'equality' do
     it 'is compared to string' do
-      val.must_be :==, 'test_value'
-      val.wont_be :==, 'not_value'
+      expect(val).must_be :==, 'test_value'
+      expect(val).wont_be :==, 'not_value'
     end
 
     it 'is compared to symbol' do
-      val.must_be :==, :test_value
-      val.wont_be :==, :not_value
+      expect(val).must_be :==, :test_value
+      expect(val).wont_be :==, :not_value
     end
 
     it 'is compared to integer' do
-      val.must_be :==, 1
-      val.wont_be :==, 2
+      expect(val).must_be :==, 1
+      expect(val).wont_be :==, 2
     end
   end
 
   describe 'translation' do
     it 'uses common translation' do
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
-        val.text.must_be :==, "Common translation"
+        expect(val.text).must_be :==, "Common translation"
       end
     end
 
     it 'uses default translation from the "default" section if its present' do
       store_translations(:en, :enumerize => {:defaults => {:attribute_name => {:test_value => "Common translation"}}}) do
-        val.text.must_be :==, "Common translation"
+        expect(val.text).must_be :==, "Common translation"
       end
     end
 
@@ -51,7 +51,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
 
       store_translations(:en, :enumerize => {:model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
-        val.text.must_be :==, "Model Specific translation"
+        expect(val.text).must_be :==, "Model Specific translation"
       end
     end
 
@@ -59,13 +59,13 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["enumerize.model_name.attribute_name"]
 
       store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}, :model_name => {:attribute_name => {:test_value => "Model Specific translation"}}}) do
-        val.text.must_be :==, "Model Specific translation"
+        expect(val.text).must_be :==, "Model Specific translation"
       end
     end
 
     it 'uses simply humanized value when translation is undefined' do
       store_translations(:en, :enumerize => {}) do
-        val.text.must_be :==, "Test value"
+        expect(val.text).must_be :==, "Test value"
       end
     end
 
@@ -73,7 +73,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        val.text.must_be :==, "Scope specific translation"
+        expect(val.text).must_be :==, "Scope specific translation"
       end
     end
 
@@ -81,14 +81,7 @@ describe Enumerize::Value do
       attr.i18n_scopes = ["nonexistent.scope", "other.scope"]
 
       store_translations(:en, :other => {:scope => {:test_value => "Scope specific translation"}}) do
-        val.text.must_be :==, "Scope specific translation"
-      end
-    end
-
-    it 'returns nil if value was modified' do
-      store_translations(:en, :enumerize => {:attribute_name => {:test_value => "Common translation"}}) do
-        modified_val = val.upcase
-        modified_val.text.must_be_nil
+        expect(val.text).must_be :==, "Scope specific translation"
       end
     end
   end
@@ -99,44 +92,44 @@ describe Enumerize::Value do
     end
 
     it 'returns true if value equals method' do
-      val.test_value?.must_equal true
+      expect(val.test_value?).must_equal true
     end
 
     it 'returns false if value does not equal method' do
-      val.other_value?.must_equal false
+      expect(val.other_value?).must_equal false
     end
 
     it 'raises NoMethodError if there are no values like boolean method' do
-      proc {
+      expect(proc {
         val.some_method?
-      }.must_raise NoMethodError
+      }).must_raise NoMethodError
     end
 
     it 'raises ArgumentError if arguments are passed' do
-      proc {
+      expect(proc {
         val.other_value?('<3')
-      }.must_raise ArgumentError
+      }).must_raise ArgumentError
     end
 
     it 'responds to methods for existing values' do
-      val.must_respond_to :test_value?
-      val.must_respond_to :other_value?
+      expect(val).must_respond_to :test_value?
+      expect(val).must_respond_to :other_value?
     end
 
     it 'returns a method object' do
-      val.method(:test_value?).must_be_instance_of Method
+      expect(val.method(:test_value?)).must_be_instance_of Method
     end
 
     it "doesn't respond to a method for not existing value" do
-      val.wont_respond_to :some_method?
+      expect(val).wont_respond_to :some_method?
     end
 
     it "doesn't respond to methods is value was modified" do
       modified_value = val.upcase
 
-      modified_value.upcase.wont_respond_to :some_method?
-      modified_value.upcase.wont_respond_to :test_value?
-      modified_value.upcase.wont_respond_to :other_value?
+      expect(modified_value.upcase).wont_respond_to :some_method?
+      expect(modified_value.upcase).wont_respond_to :test_value?
+      expect(modified_value.upcase).wont_respond_to :other_value?
     end
   end
 
@@ -149,7 +142,7 @@ describe Enumerize::Value do
 
     it 'serializes with Marshal' do
       dump_value = Marshal.dump(val)
-      Marshal.load(dump_value).must_equal 'test_value'
+      expect(Marshal.load(dump_value)).must_equal 'test_value'
     end
   end