Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/active_resource/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ module ActiveResource
# requests. These sensitive credentials are sent unencrypted, visible to
# any onlooker, so this scheme should only be used with SSL.
#
# Digest authentication sends a crytographic hash of the username, password,
# Digest authentication sends a cryptographic hash of the username, password,
# HTTP method, URI, and a single-use secret key provided by the server.
# Sensitive credentials aren't visible to onlookers, so digest authentication
# doesn't require SSL. However, this doesn't mean the connection is secure!
Expand Down
2 changes: 1 addition & 1 deletion lib/active_resource/collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Collection # :nodoc:
# ActiveResource::Collection is a wrapper to handle parsing index responses that
# do not directly map to Rails conventions.
#
# You can define a custom class that inherets from ActiveResource::Collection
# You can define a custom class that inherits from ActiveResource::Collection
# in order to to set the elements instance.
#
# GET /posts.json delivers following response body:
Expand Down
4 changes: 2 additions & 2 deletions test/cases/base/load_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def setup
places: [ "Columbia City", "Unknown" ] } } }


# List of books formated as [{timestamp_of_publication => name}, ...]
# List of books formatted as [{timestamp_of_publication => name}, ...]
@books = { books: [
{ 1009839600 => "Ruby in a Nutshell" },
{ 1199142000 => "The Ruby Programming Language" }
Expand Down Expand Up @@ -123,7 +123,7 @@ def test_load_simple_hash
assert_equal @matz.stringify_keys, @person.load(@matz).attributes
end

def test_load_object_with_implict_conversion_to_hash
def test_load_object_with_implicit_conversion_to_hash
assert_equal @matz.stringify_keys, @person.load(FakeParameters.new(@matz)).attributes
end

Expand Down
2 changes: 1 addition & 1 deletion test/cases/collection_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ReduxCollection < ActiveResource::Base
end


class CollectionInheretanceTest < ActiveSupport::TestCase
class CollectionInheritanceTest < ActiveSupport::TestCase
def setup
@post = { id: 1, title: "Awesome" }
@posts_hash = { "results" => [@post], :next_page => "/paginated_posts.json?page=2" }
Expand Down
2 changes: 1 addition & 1 deletion test/cases/connection_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def test_proxy_accessor_accepts_uri_or_string_argument
assert_equal proxy, @conn.proxy
end

def test_proxy_accessor_accepts_uri_or_string_argument_with_spectials_characters
def test_proxy_accessor_accepts_uri_or_string_argument_with_special_characters
user = "proxy_;{(,!$%_user"
password = "proxy_;:{(,!$%_password"

Expand Down
4 changes: 2 additions & 2 deletions test/cases/http_mock_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class HttpMockTest < ActiveSupport::TestCase
assert_equal 2, ActiveResource::HttpMock.responses.length
end

test "allows you to replace the existing reponse with the same request by calling a block" do
test "allows you to replace the existing response with the same request by calling a block" do
ActiveResource::HttpMock.respond_to do |mock|
mock.send(:get, "/people/1", {}, "JSON1")
end
Expand All @@ -154,7 +154,7 @@ class HttpMockTest < ActiveSupport::TestCase
assert_equal 1, ActiveResource::HttpMock.responses.length
end

test "allows you to replace the existing reponse with the same request by passing pairs" do
test "allows you to replace the existing response with the same request by passing pairs" do
ActiveResource::HttpMock.respond_to do |mock|
mock.send(:get, "/people/1", {}, "JSON1")
end
Expand Down