diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index daa8962929a88b2a752c52b35ec00897038e9bfb..160763779edcc49174ee8c8b734d0eeaf9cf6f14 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -522,9 +522,9 @@ def timeout # # * :key - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object. # * :cert - An OpenSSL::X509::Certificate object as client certificate - # * :ca_file - Path to a CA certification file in PEM format. The file can contrain several CA certificates. + # * :ca_file - Path to a CA certification file in PEM format. The file can contain several CA certificates. # * :ca_path - Path of a CA certification directory containing certifications in PEM format. - # * :verify_mode - Flags for server the certification verification at begining of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable) + # * :verify_mode - Flags for server the certification verification at beginning of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable) # * :verify_callback - The verify callback for the server certification verification. # * :verify_depth - The maximum depth for the certificate chain verification. # * :cert_store - OpenSSL::X509::Store to verify peer certificate. diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index ab801902ac95d7914b4b0ebaedf82b5e70933d0f..48dacbdf678ca07d0a3b5484a5a0364b6e68aa6b 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -876,7 +876,7 @@ def test_delete_with_410_gone end ######################################################################## - # Tests the more miscelaneous helper methods + # Tests the more miscellaneous helper methods ######################################################################## def test_exists # Class method. diff --git a/activeresource/test/cases/validations_test.rb b/activeresource/test/cases/validations_test.rb index 671d1ea8f01da7706b8443355a98a687ee70b65f..3b1caecb04c80564ebb1b02a8129c7e32cfb72f2 100644 --- a/activeresource/test/cases/validations_test.rb +++ b/activeresource/test/cases/validations_test.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/hash/conversions' # The validations are tested thoroughly under ActiveModel::Validations -# This test case simply makes sur that they are all accessible by +# This test case simply makes sure that they are all accessible by # Active Resource objects. class ValidationsTest < ActiveModel::TestCase VALID_PROJECT_HASH = { :name => "My Project", :description => "A project" } diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb index fe80cdf2e52adfbd8cedac78d59c9bf260cbb72a..6e79845aa01c0e53d4d3a6bcf04678be6f044511 100644 --- a/activeresource/test/connection_test.rb +++ b/activeresource/test/connection_test.rb @@ -44,7 +44,7 @@ def test_handle_response # 401 is an unauthorized request assert_response_raises ActiveResource::UnauthorizedAccess, 401 - # 403 is a forbidden requst (and authorizing will not help) + # 403 is a forbidden request (and authorizing will not help) assert_response_raises ActiveResource::ForbiddenAccess, 403 # 404 is a missing resource. diff --git a/activeresource/test/fixtures/address.rb b/activeresource/test/fixtures/address.rb index fe921e15955217050ef9da086da159f3db68ab5e..7a73ecb52a02334079115de4beef77a5833b7595 100644 --- a/activeresource/test/fixtures/address.rb +++ b/activeresource/test/fixtures/address.rb @@ -1,4 +1,4 @@ -# turns everyting into the same object +# turns everything into the same object class AddressXMLFormatter include ActiveResource::Formats::XmlFormat