Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
test cleanup
  • Loading branch information
fhwang committed Mar 3, 2012
1 parent 802202c commit 8323b09
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 27 deletions.
7 changes: 0 additions & 7 deletions test/unit/configuration_test.rb
Expand Up @@ -73,13 +73,6 @@ def test_before_save_with_only_the_first_argument
end
end

def test_validate_uniqueness_with_an_allow_nil_allows_nil_configuration
User.sample
user = User.sample
assert_nil user.external_user
assert_nil user.external_user_id
end

def test_attr_accessor_can_have_configured_default
blog_post = BlogPost.sample
assert_equal('I am an instance attribute', blog_post.instance_attribute)
Expand Down
20 changes: 0 additions & 20 deletions test/unit/sample_test.rb
Expand Up @@ -31,26 +31,6 @@ def test_allows_overrides_of_all_fields
end
end

def test_picks_a_value_given_in_a_validates_inclusion_of
assert_difference('User.count') do
user = User.sample
assert(%(m f).include?(user.gender))
end
end

def test_cant_override_validations
assert_no_difference('User.count') do
assert_raise(ActiveRecord::RecordInvalid) do
User.sample(:gender => 'x')
end
end
assert_no_difference('User.count') do
assert_raise(ActiveRecord::RecordInvalid) do
User.sample(:email => 'call.me')
end
end
end

def test_set_emails
assert_difference('User.count') do
user = User.sample
Expand Down
31 changes: 31 additions & 0 deletions test/unit/validations_test.rb
@@ -0,0 +1,31 @@
require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))

class ValidationsTest < SampleModelsTestCase
def test_validate_uniqueness_with_an_allow_nil_allows_nil_configuration
User.sample
user = User.sample
assert_nil user.external_user
assert_nil user.external_user_id
end

def test_picks_a_value_given_in_a_validates_inclusion_of
assert_difference('User.count') do
user = User.sample
assert(%(m f).include?(user.gender))
end
end

def test_cant_override_validations
assert_no_difference('User.count') do
assert_raise(ActiveRecord::RecordInvalid) do
User.sample(:gender => 'x')
end
end
assert_no_difference('User.count') do
assert_raise(ActiveRecord::RecordInvalid) do
User.sample(:email => 'call.me')
end
end
end
end

0 comments on commit 8323b09

Please sign in to comment.