Permalink
Browse files

Merge pull request #9728 from vipulnsward/fix_em_typos

Small typos here and there.
  • Loading branch information...
2 parents 962604f + 29dcf09 commit df21d1eaee11e82c9a83566e2d7c4b771e344686 @carlosantoniodasilva carlosantoniodasilva committed Mar 15, 2013
@@ -111,7 +111,7 @@
* Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default
propagate `:skip_types, :dasherize, :camelize` keys to included associations.
- It can be overriden on each association by explicitly specifying the option on one
+ It can be overridden on each association by explicitly specifying the option on one
or more associations
*Anthony Alberto*
@@ -194,7 +194,7 @@ def foo
assert_raises(NoMethodError) { ModelWithAttributes.new.foo }
end
- test 'acessing a suffixed attribute' do
+ test 'accessing a suffixed attribute' do
m = ModelWithAttributes2.new
m.attributes = { 'foo' => 'bar' }
@@ -245,7 +245,7 @@ def test_param_key_for_class
end
def test_uncountable
- assert uncountable?(@uncountable), "Expected 'sheep' to be uncoutable"
+ assert uncountable?(@uncountable), "Expected 'sheep' to be uncountable"
assert !uncountable?(@klass), "Expected 'contact' to be countable"
end
@@ -213,7 +213,7 @@ def test_validation_order
assert_equal 'is too short (minimum is 2 characters)', t.errors[key][0]
end
- def test_validaton_with_if_and_on
+ def test_validation_with_if_and_on
Topic.validates_presence_of :title, :if => Proc.new{|x| x.author_name = "bad"; true }, :on => :update
t = Topic.new(:title => "")
@@ -361,7 +361,7 @@ def test_does_not_modify_options_argument
def test_dup_validity_is_independent
Topic.validates_presence_of :title
- topic = Topic.new("title" => "Litterature")
+ topic = Topic.new("title" => "Literature")
topic.valid?
duped = topic.dup

0 comments on commit df21d1e

Please sign in to comment.