mirror of
https://github.com/thoughtbot/shoulda-matchers.git
synced 2022-11-09 12:01:38 -05:00
Rewrite tests for validate_uniqueness_of
* The main problem I had with the old tests is that information that the reader didn't need to care about was not properly abstracted away. For instance, a helper method used by almost all tests will always create a model called Example, and will always use an attribute called "attr" (on which the validation is present). However, in some tests the class or attribute is referred to directly. The reader shouldn't have to care about either of these things, since they are constant -- the tests should be readable enough so that this information is not necessary to understand the case being tested against. * Speaking of this helper method, some of the tests used it and some didn't. Some defined their own helper methods to represent a particular case (`case_sensitive: true`, `allow_nil`, etc.). This is now fixed so that all but two tests use the same helper method to define a model. This model is completely customizable -- one can specify the type of the attribute being validated, the names and types of scoped attributes, etc. * The tests around scoped attributes and different types are all basically the same, so they are now compressed into a shared context. * Related to this, we no longer have to worry about setting a proper value for a scope attribute. One had to know which type that attribute had and come up with a reasonable default for that type. Now there is a helper method that worries about this automatically. * Finally, we remove tests around case_insensitive against an integer attribute (these don't make any sense, and don't work).
This commit is contained in:
parent
56ded0548d
commit
a43b8e44dd
5 changed files with 675 additions and 488 deletions
|
@ -3,3 +3,10 @@ StringLiterals:
|
||||||
|
|
||||||
AlignParameters:
|
AlignParameters:
|
||||||
EnforcedStyle: with_fixed_indentation
|
EnforcedStyle: with_fixed_indentation
|
||||||
|
|
||||||
|
CollectionMethods:
|
||||||
|
PreferredMethods:
|
||||||
|
find: detect
|
||||||
|
reduce: inject
|
||||||
|
collect: map
|
||||||
|
find_all: select
|
||||||
|
|
|
@ -12,5 +12,13 @@ module UnitTests
|
||||||
def active_record_can_raise_range_error?
|
def active_record_can_raise_range_error?
|
||||||
active_record_version >= 4.2
|
active_record_version >= 4.2
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def active_record_supports_enum?
|
||||||
|
defined?(::ActiveRecord::Enum)
|
||||||
|
end
|
||||||
|
|
||||||
|
def active_record_supports_has_secure_password?
|
||||||
|
active_record_version >= 3.1
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -68,7 +68,11 @@ module UnitTests
|
||||||
|
|
||||||
define_model_class(class_name).tap do |model|
|
define_model_class(class_name).tap do |model|
|
||||||
if block
|
if block
|
||||||
|
if block.arity == 0
|
||||||
model.class_eval(&block)
|
model.class_eval(&block)
|
||||||
|
else
|
||||||
|
block.call(model)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
model.table_name = table_name
|
model.table_name = table_name
|
||||||
|
|
|
@ -20,9 +20,5 @@ module UnitTests
|
||||||
def rails_gte_4_1?
|
def rails_gte_4_1?
|
||||||
rails_version >= 4.1
|
rails_version >= 4.1
|
||||||
end
|
end
|
||||||
|
|
||||||
def active_record_supports_enum?
|
|
||||||
defined?(::ActiveRecord::Enum)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue