kotovalexarian-likes-github
/
thoughtbot--shoulda-matchers
mirror of https://github.com/thoughtbot/shoulda-matchers.git
1
0
Fork 0
Code Releases Activity

ensure_inclusion_of => validate_inclusion_of

This commit is contained in:
Maxim Kaschenko 2014-04-24 11:25:34 +07:00 committed by Elliot Winkler
parent 7e1452977c
commit 93c2336e98
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -12,8 +12,8 @@ complex, and error-prone.
tests usage of Rails 3's `attr_accessible` and `attr_protected` macros.
* **[allow_value](lib/shoulda/matchers/active_model/allow_value_matcher.rb)** tests usage of
the `validates_format_of` validation.
* **[ensure_inclusion_of](lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb)** tests
usage of `validates_inclusion_of`.
* **[validate_inclusion_of](lib/shoulda/matchers/active_model/validate_inclusion_of_matcher.rb)**
tests usage of `validates_inclusion_of`.
* **[ensure_exclusion_of](lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb)** tests
usage of `validates_exclusion_of`.
* **[ensure_length_of](lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb)** tests usage

2
lib/shoulda/matchers/active_model.rb
View File

@ -5,7 +5,7 @@ require 'shoulda/matchers/active_model/exception_message_finder'
require 'shoulda/matchers/active_model/allow_value_matcher'
require 'shoulda/matchers/active_model/disallow_value_matcher'
require 'shoulda/matchers/active_model/ensure_length_of_matcher'
require 'shoulda/matchers/active_model/ensure_inclusion_of_matcher'
require 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
require 'shoulda/matchers/active_model/ensure_exclusion_of_matcher'
require 'shoulda/matchers/active_model/validate_absence_of_matcher'
require 'shoulda/matchers/active_model/validate_presence_of_matcher'

43
lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb → lib/shoulda/matchers/active_model/validate_inclusion_of_matcher.rb
View File

@ -3,7 +3,7 @@ require 'bigdecimal'
module Shoulda
module Matchers
module ActiveModel
# The `ensure_inclusion_of` matcher tests usage of the
# The `validate_inclusion_of` matcher tests usage of the
# `validates_inclusion_of` validation, asserting that an attribute can
# take a whitelist of values and cannot take values outside of this list.
#
@ -19,14 +19,14 @@ module Shoulda
# # RSpec
# describe Issue do
# it do
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved))
# end
# end
#
# # Test::Unit
# class IssueTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved))
# end
#
@ -41,12 +41,12 @@ module Shoulda
#
# # RSpec
# describe Issue do
# it { should ensure_inclusion_of(:state).in_range(1..5) }
# it { should validate_inclusion_of(:state).in_range(1..5) }
# end
#
# # Test::Unit
# class IssueTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:state).in_range(1..5)
# should validate_inclusion_of(:state).in_range(1..5)
# end
#
# #### Optional qualifiers
@ -67,7 +67,7 @@ module Shoulda
# # RSpec
# describe Issue do
# it do
# should ensure_inclusion_of(:severity).
# should validate_inclusion_of(:severity).
# in_array(%w(low medium high)).
# with_message('Severity must be low, medium, or high')
# end
@ -75,7 +75,7 @@ module Shoulda
#
# # Test::Unit
# class IssueTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:severity).
# should validate_inclusion_of(:severity).
# in_array(%w(low medium high)).
# with_message('Severity must be low, medium, or high')
# end
@ -103,7 +103,7 @@ module Shoulda
# # RSpec
# describe Person do
# it do
# should ensure_inclusion_of(:age).
# should validate_inclusion_of(:age).
# in_range(0..65).
# with_low_message('You do not receive any benefits')
# end
@ -111,7 +111,7 @@ module Shoulda
#
# # Test::Unit
# class PersonTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:age).
# should validate_inclusion_of(:age).
# in_range(0..65).
# with_low_message('You do not receive any benefits')
# end
@ -139,7 +139,7 @@ module Shoulda
# # RSpec
# describe Person do
# it do
# should ensure_inclusion_of(:age).
# should validate_inclusion_of(:age).
# in_range(0..21).
# with_high_message("You're too old for this stuff")
# end
@ -147,7 +147,7 @@ module Shoulda
#
# # Test::Unit
# class PersonTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:age).
# should validate_inclusion_of(:age).
# in_range(0..21).
# with_high_message("You're too old for this stuff")
# end
@ -169,7 +169,7 @@ module Shoulda
# # RSpec
# describe Issue do
# it do
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved)).
# allow_nil
# end
@ -177,7 +177,7 @@ module Shoulda
#
# # Test::Unit
# class IssueTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved)).
# allow_nil
# end
@ -199,7 +199,7 @@ module Shoulda
# # RSpec
# describe Issue do
# it do
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved)).
# allow_blank
# end
@ -207,24 +207,25 @@ module Shoulda
#
# # Test::Unit
# class IssueTest < ActiveSupport::TestCase
# should ensure_inclusion_of(:state).
# should validate_inclusion_of(:state).
# in_array(%w(open resolved unresolved)).
# allow_blank
# end
#
# @return [EnsureInclusionOfMatcher]
# @return [ValidateInclusionOfMatcher]
#
def ensure_inclusion_of(attr)
EnsureInclusionOfMatcher.new(attr)
def validate_inclusion_of(attr)
ValidateInclusionOfMatcher.new(attr)
end
alias_method :ensure_inclusion_of, :validate_inclusion_of
# @private
class EnsureInclusionOfMatcher < ValidationMatcher
class ValidateInclusionOfMatcher < ValidationMatcher
ARBITRARY_OUTSIDE_STRING = 'shouldamatchersteststring'
ARBITRARY_OUTSIDE_FIXNUM = 123456789
ARBITRARY_OUTSIDE_DECIMAL = BigDecimal.new('0.123456789')
BOOLEAN_ALLOWS_BOOLEAN_MESSAGE = <<EOT
You are using `ensure_inclusion_of` to assert that a boolean column allows
You are using `validate_inclusion_of` to assert that a boolean column allows
boolean values and disallows non-boolean ones. Assuming you are using
`validates_format_of` in your model, be aware that it is not possible to fully
test this, and in fact the validation is superfluous, as boolean columns will
@ -232,7 +233,7 @@ automatically convert non-boolean values to boolean ones. Hence, you should
consider removing this test and the corresponding validation.
EOT
BOOLEAN_ALLOWS_NIL_MESSAGE = <<EOT
You are using `ensure_inclusion_of` to assert that a boolean column allows nil.
You are using `validate_inclusion_of` to assert that a boolean column allows nil.
Be aware that it is not possible to fully test this, as anything other than
true, false or nil will be converted to false. Hence, you should consider
removing this test and the corresponding validation.

18
spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb → spec/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb
View File

@ -1,6 +1,14 @@
require 'spec_helper'
describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
describe Shoulda::Matchers::ActiveModel do
describe '#ensure_inclusion_of' do
it 'is aliased to #validate_inclusion_of' do
expect(method(:ensure_inclusion_of)).to eq(method(:validate_inclusion_of))
end
end
end
describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
shared_context 'for a generic attribute' do
def self.testing_values_of_option(option_name, &block)
[nil, true, false].each do |option_value|
@ -436,7 +444,7 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
it 'prints a warning' do
valid_values = [true, false]
builder = build_object_allowing(valid_values)
message = 'You are using `ensure_inclusion_of` to assert that a boolean column allows boolean values and disallows non-boolean ones'
message = 'You are using `validate_inclusion_of` to assert that a boolean column allows boolean values and disallows non-boolean ones'
stderr = capture(:stderr) do
expect_to_match_in_array(builder, valid_values)
@ -466,7 +474,7 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
it 'prints a warning' do
valid_values = [nil]
builder = build_object_allowing(valid_values)
message = 'You are using `ensure_inclusion_of` to assert that a boolean column allows nil'
message = 'You are using `validate_inclusion_of` to assert that a boolean column allows nil'
stderr = capture(:stderr) do
expect_to_match_in_array(builder, valid_values)
@ -599,13 +607,13 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
end
def expect_to_match(builder)
matcher = ensure_inclusion_of(builder.attribute)
matcher = validate_inclusion_of(builder.attribute)
yield matcher if block_given?
expect(builder.object).to(matcher)
end
def expect_not_to_match(builder)
matcher = ensure_inclusion_of(builder.attribute)
matcher = validate_inclusion_of(builder.attribute)
yield matcher if block_given?
expect(builder.object).not_to(matcher)
end