mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Refactor setup methods by extracting them in abstract_unit, remove TODO.
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Emilio Tagua
José Valim
parent
a521a3c05a
commit
f2765a1cb3
4 changed files with 103 additions and 237 deletions
|
|
@ -18,3 +18,101 @@ begin
|
|||
require 'ruby-debug'
|
||||
rescue LoadError
|
||||
end
|
||||
|
||||
def setup_response
|
||||
@default_request_headers = { 'Content-Type' => 'application/xml' }
|
||||
@matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
|
||||
@david = { :id => 2, :name => 'David' }.to_xml(:root => 'person')
|
||||
@greg = { :id => 3, :name => 'Greg' }.to_xml(:root => 'person')
|
||||
@addy = { :id => 1, :street => '12345 Street', :country => 'Australia' }.to_xml(:root => 'address')
|
||||
@rick = { :name => "Rick", :age => 25 }.to_xml(:root => "person")
|
||||
@joe = { 'person' => { :id => 6, :name => 'Joe' }}.to_json
|
||||
@people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@addresses = [{ :id => 1, :street => '12345 Street', :country => 'Australia' }].to_xml(:root => 'addresses')
|
||||
|
||||
# - deep nested resource -
|
||||
# - Luis (Customer)
|
||||
# - JK (Customer::Friend)
|
||||
# - Mateo (Customer::Friend::Brother)
|
||||
# - Edith (Customer::Friend::Brother::Child)
|
||||
# - Martha (Customer::Friend::Brother::Child)
|
||||
# - Felipe (Customer::Friend::Brother)
|
||||
# - Bryan (Customer::Friend::Brother::Child)
|
||||
# - Luke (Customer::Friend::Brother::Child)
|
||||
# - Eduardo (Customer::Friend)
|
||||
# - Sebas (Customer::Friend::Brother)
|
||||
# - Andres (Customer::Friend::Brother::Child)
|
||||
# - Jorge (Customer::Friend::Brother::Child)
|
||||
# - Elsa (Customer::Friend::Brother)
|
||||
# - Natacha (Customer::Friend::Brother::Child)
|
||||
# - Milena (Customer::Friend::Brother)
|
||||
#
|
||||
@luis = {:id => 1, :name => 'Luis',
|
||||
:friends => [{:name => 'JK',
|
||||
:brothers => [{:name => 'Mateo',
|
||||
:children => [{:name => 'Edith'},{:name => 'Martha'}]},
|
||||
{:name => 'Felipe',
|
||||
:children => [{:name => 'Bryan'},{:name => 'Luke'}]}]},
|
||||
{:name => 'Eduardo',
|
||||
:brothers => [{:name => 'Sebas',
|
||||
:children => [{:name => 'Andres'},{:name => 'Jorge'}]},
|
||||
{:name => 'Elsa',
|
||||
:children => [{:name => 'Natacha'}]},
|
||||
{:name => 'Milena',
|
||||
:children => []}]}]}.to_xml(:root => 'customer')
|
||||
# - resource with yaml array of strings; for ARs using serialize :bar, Array
|
||||
@marty = <<-eof.strip
|
||||
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<person>
|
||||
<id type=\"integer\">5</id>
|
||||
<name>Marty</name>
|
||||
<colors type=\"yaml\">---
|
||||
- \"red\"
|
||||
- \"green\"
|
||||
- \"blue\"
|
||||
</colors>
|
||||
</person>
|
||||
eof
|
||||
|
||||
ActiveResource::HttpMock.respond_to do |mock|
|
||||
mock.get "/people/1.xml", {}, @matz
|
||||
mock.get "/people/2.xml", {}, @david
|
||||
mock.get "/people/5.xml", {}, @marty
|
||||
mock.get "/people/Greg.xml", {}, @greg
|
||||
mock.get "/people/6.json", {}, @joe
|
||||
mock.get "/people/4.xml", {'key' => 'value'}, nil, 404
|
||||
mock.put "/people/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1.xml", {}, nil, 200
|
||||
mock.delete "/people/2.xml", {}, nil, 400
|
||||
mock.get "/people/99.xml", {}, nil, 404
|
||||
mock.post "/people.xml", {}, @rick, 201, 'Location' => '/people/5.xml'
|
||||
mock.get "/people.xml", {}, @people
|
||||
mock.get "/people/1/addresses.xml", {}, @addresses
|
||||
mock.get "/people/1/addresses/1.xml", {}, @addy
|
||||
mock.get "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.get "/people/Greg/addresses/1.xml", {}, @addy
|
||||
mock.put "/people/1/addresses/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.post "/people/1/addresses.xml", {}, nil, 201, 'Location' => '/people/1/addresses/5'
|
||||
mock.get "/people//addresses.xml", {}, nil, 404
|
||||
mock.get "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.put "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.delete "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.post "/people//addresses.xml", {}, nil, 404
|
||||
mock.head "/people/1.xml", {}, nil, 200
|
||||
mock.head "/people/Greg.xml", {}, nil, 200
|
||||
mock.head "/people/99.xml", {}, nil, 404
|
||||
mock.head "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.head "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.head "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.head "/people/Greg/addresses/1.xml", {}, nil, 200
|
||||
# customer
|
||||
mock.get "/customers/1.xml", {}, @luis
|
||||
end
|
||||
|
||||
Person.user = nil
|
||||
Person.password = nil
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,58 +8,13 @@ require "fixtures/street_address"
|
|||
########################################################################
|
||||
class SchemaTest < ActiveModel::TestCase
|
||||
def setup
|
||||
@matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
|
||||
@david = { :id => 2, :name => 'David' }.to_xml(:root => 'person')
|
||||
@greg = { :id => 3, :name => 'Greg' }.to_xml(:root => 'person')
|
||||
@addy = { :id => 1, :street => '12345 Street', :country => 'Australia' }.to_xml(:root => 'address')
|
||||
@default_request_headers = { 'Content-Type' => 'application/xml' }
|
||||
@rick = { :name => "Rick", :age => 25 }.to_xml(:root => "person")
|
||||
@people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@addresses = [{ :id => 1, :street => '12345 Street', :country => 'Australia' }].to_xml(:root => 'addresses')
|
||||
|
||||
ActiveResource::HttpMock.respond_to do |mock|
|
||||
mock.get "/people/1.xml", {}, @matz
|
||||
mock.get "/people/2.xml", {}, @david
|
||||
mock.get "/people/Greg.xml", {}, @greg
|
||||
mock.get "/people/4.xml", {'key' => 'value'}, nil, 404
|
||||
mock.get "/people/5.xml", {}, @rick
|
||||
mock.put "/people/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1.xml", {}, nil, 200
|
||||
mock.delete "/people/2.xml", {}, nil, 400
|
||||
mock.get "/people/99.xml", {}, nil, 404
|
||||
mock.post "/people.xml", {}, @rick, 201, 'Location' => '/people/5.xml'
|
||||
mock.get "/people.xml", {}, @people
|
||||
mock.get "/people/1/addresses.xml", {}, @addresses
|
||||
mock.get "/people/1/addresses/1.xml", {}, @addy
|
||||
mock.get "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.get "/people/Greg/addresses/1.xml", {}, @addy
|
||||
mock.put "/people/1/addresses/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.post "/people/1/addresses.xml", {}, nil, 201, 'Location' => '/people/1/addresses/5'
|
||||
mock.get "/people//addresses.xml", {}, nil, 404
|
||||
mock.get "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.put "/people//addressaddresseses/1.xml", {}, nil, 404
|
||||
mock.delete "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.post "/people//addresses.xml", {}, nil, 404
|
||||
mock.head "/people/1.xml", {}, nil, 200
|
||||
mock.head "/people/Greg.xml", {}, nil, 200
|
||||
mock.head "/people/99.xml", {}, nil, 404
|
||||
mock.head "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.head "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.head "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.head "/people/Greg/addresses/1.xml", {}, nil, 200
|
||||
end
|
||||
|
||||
Person.user = nil
|
||||
Person.password = nil
|
||||
setup_response # find me in abstract_unit
|
||||
end
|
||||
|
||||
def teardown
|
||||
Person.schema = nil # hack to stop test bleedthrough...
|
||||
end
|
||||
|
||||
|
||||
#####################################################
|
||||
# Passing in a schema directly and returning it
|
||||
####
|
||||
|
|
|
|||
|
|
@ -12,101 +12,8 @@ require 'mocha'
|
|||
|
||||
class BaseTest < Test::Unit::TestCase
|
||||
def setup
|
||||
@default_request_headers = { 'Content-Type' => 'application/xml' }
|
||||
@matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
|
||||
@david = { :id => 2, :name => 'David' }.to_xml(:root => 'person')
|
||||
@greg = { :id => 3, :name => 'Greg' }.to_xml(:root => 'person')
|
||||
@addy = { :id => 1, :street => '12345 Street', :country => 'Australia' }.to_xml(:root => 'address')
|
||||
@rick = { :name => "Rick", :age => 25 }.to_xml(:root => "person")
|
||||
@joe = { 'person' => { :id => 6, :name => 'Joe' }}.to_json
|
||||
@people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@addresses = [{ :id => 1, :street => '12345 Street', :country => 'Australia' }].to_xml(:root => 'addresses')
|
||||
|
||||
# - deep nested resource -
|
||||
# - Luis (Customer)
|
||||
# - JK (Customer::Friend)
|
||||
# - Mateo (Customer::Friend::Brother)
|
||||
# - Edith (Customer::Friend::Brother::Child)
|
||||
# - Martha (Customer::Friend::Brother::Child)
|
||||
# - Felipe (Customer::Friend::Brother)
|
||||
# - Bryan (Customer::Friend::Brother::Child)
|
||||
# - Luke (Customer::Friend::Brother::Child)
|
||||
# - Eduardo (Customer::Friend)
|
||||
# - Sebas (Customer::Friend::Brother)
|
||||
# - Andres (Customer::Friend::Brother::Child)
|
||||
# - Jorge (Customer::Friend::Brother::Child)
|
||||
# - Elsa (Customer::Friend::Brother)
|
||||
# - Natacha (Customer::Friend::Brother::Child)
|
||||
# - Milena (Customer::Friend::Brother)
|
||||
#
|
||||
@luis = {:id => 1, :name => 'Luis',
|
||||
:friends => [{:name => 'JK',
|
||||
:brothers => [{:name => 'Mateo',
|
||||
:children => [{:name => 'Edith'},{:name => 'Martha'}]},
|
||||
{:name => 'Felipe',
|
||||
:children => [{:name => 'Bryan'},{:name => 'Luke'}]}]},
|
||||
{:name => 'Eduardo',
|
||||
:brothers => [{:name => 'Sebas',
|
||||
:children => [{:name => 'Andres'},{:name => 'Jorge'}]},
|
||||
{:name => 'Elsa',
|
||||
:children => [{:name => 'Natacha'}]},
|
||||
{:name => 'Milena',
|
||||
:children => []}]}]}.to_xml(:root => 'customer')
|
||||
# - resource with yaml array of strings; for ARs using serialize :bar, Array
|
||||
@marty = <<-eof.strip
|
||||
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<person>
|
||||
<id type=\"integer\">5</id>
|
||||
<name>Marty</name>
|
||||
<colors type=\"yaml\">---
|
||||
- \"red\"
|
||||
- \"green\"
|
||||
- \"blue\"
|
||||
</colors>
|
||||
</person>
|
||||
eof
|
||||
|
||||
ActiveResource::HttpMock.respond_to do |mock|
|
||||
mock.get "/people/1.xml", {}, @matz
|
||||
mock.get "/people/2.xml", {}, @david
|
||||
mock.get "/people/6.json", {}, @joe
|
||||
mock.get "/people/5.xml", {}, @marty
|
||||
mock.get "/people/Greg.xml", {}, @greg
|
||||
mock.get "/people/4.xml", {'key' => 'value'}, nil, 404
|
||||
mock.put "/people/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1.xml", {}, nil, 200
|
||||
mock.delete "/people/2.xml", {}, nil, 400
|
||||
mock.get "/people/99.xml", {}, nil, 404
|
||||
mock.post "/people.xml", {}, @rick, 201, 'Location' => '/people/5.xml'
|
||||
mock.get "/people.xml", {}, @people
|
||||
mock.get "/people/1/addresses.xml", {}, @addresses
|
||||
mock.get "/people/1/addresses/1.xml", {}, @addy
|
||||
mock.get "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.get "/people/Greg/addresses/1.xml", {}, @addy
|
||||
mock.put "/people/1/addresses/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.post "/people/1/addresses.xml", {}, nil, 201, 'Location' => '/people/1/addresses/5'
|
||||
mock.get "/people//addresses.xml", {}, nil, 404
|
||||
mock.get "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.put "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.delete "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.post "/people//addresses.xml", {}, nil, 404
|
||||
mock.head "/people/1.xml", {}, nil, 200
|
||||
mock.head "/people/Greg.xml", {}, nil, 200
|
||||
mock.head "/people/99.xml", {}, nil, 404
|
||||
mock.head "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.head "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.head "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.head "/people/Greg/addresses/1.xml", {}, nil, 200
|
||||
# customer
|
||||
mock.get "/customers/1.xml", {}, @luis
|
||||
end
|
||||
|
||||
setup_response # find me in abstract_unit
|
||||
@original_person_site = Person.site
|
||||
Person.user = nil
|
||||
Person.password = nil
|
||||
end
|
||||
|
||||
def teardown
|
||||
|
|
@ -1041,7 +948,7 @@ class BaseTest < Test::Unit::TestCase
|
|||
ensure
|
||||
Person.element_name = old_elem_name
|
||||
end
|
||||
|
||||
|
||||
def test_to_xml_with_private_method_name_as_attribute
|
||||
assert_nothing_raised(ArgumentError) {
|
||||
Customer.new(:test => true).to_xml
|
||||
|
|
|
|||
|
|
@ -8,101 +8,7 @@ require 'active_support/core_ext/hash/conversions'
|
|||
|
||||
class FinderTest < Test::Unit::TestCase
|
||||
def setup
|
||||
# TODO: refactor/DRY this setup - it's a copy of the BaseTest setup.
|
||||
# We can probably put this into abstract_unit
|
||||
@matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
|
||||
@david = { :id => 2, :name => 'David' }.to_xml(:root => 'person')
|
||||
@greg = { :id => 3, :name => 'Greg' }.to_xml(:root => 'person')
|
||||
@addy = { :id => 1, :street => '12345 Street' }.to_xml(:root => 'address')
|
||||
@default_request_headers = { 'Content-Type' => 'application/xml' }
|
||||
@rick = { :name => "Rick", :age => 25 }.to_xml(:root => "person")
|
||||
@people = [{ :id => 1, :name => 'Matz' }, { :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@people_david = [{ :id => 2, :name => 'David' }].to_xml(:root => 'people')
|
||||
@addresses = [{ :id => 1, :street => '12345 Street' }].to_xml(:root => 'addresses')
|
||||
|
||||
# - deep nested resource -
|
||||
# - Luis (Customer)
|
||||
# - JK (Customer::Friend)
|
||||
# - Mateo (Customer::Friend::Brother)
|
||||
# - Edith (Customer::Friend::Brother::Child)
|
||||
# - Martha (Customer::Friend::Brother::Child)
|
||||
# - Felipe (Customer::Friend::Brother)
|
||||
# - Bryan (Customer::Friend::Brother::Child)
|
||||
# - Luke (Customer::Friend::Brother::Child)
|
||||
# - Eduardo (Customer::Friend)
|
||||
# - Sebas (Customer::Friend::Brother)
|
||||
# - Andres (Customer::Friend::Brother::Child)
|
||||
# - Jorge (Customer::Friend::Brother::Child)
|
||||
# - Elsa (Customer::Friend::Brother)
|
||||
# - Natacha (Customer::Friend::Brother::Child)
|
||||
# - Milena (Customer::Friend::Brother)
|
||||
#
|
||||
@luis = {:id => 1, :name => 'Luis',
|
||||
:friends => [{:name => 'JK',
|
||||
:brothers => [{:name => 'Mateo',
|
||||
:children => [{:name => 'Edith'},{:name => 'Martha'}]},
|
||||
{:name => 'Felipe',
|
||||
:children => [{:name => 'Bryan'},{:name => 'Luke'}]}]},
|
||||
{:name => 'Eduardo',
|
||||
:brothers => [{:name => 'Sebas',
|
||||
:children => [{:name => 'Andres'},{:name => 'Jorge'}]},
|
||||
{:name => 'Elsa',
|
||||
:children => [{:name => 'Natacha'}]},
|
||||
{:name => 'Milena',
|
||||
:children => []}]}]}.to_xml(:root => 'customer')
|
||||
# - resource with yaml array of strings; for ARs using serialize :bar, Array
|
||||
@marty = <<-eof.strip
|
||||
<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<person>
|
||||
<id type=\"integer\">5</id>
|
||||
<name>Marty</name>
|
||||
<colors type=\"yaml\">---
|
||||
- \"red\"
|
||||
- \"green\"
|
||||
- \"blue\"
|
||||
</colors>
|
||||
</person>
|
||||
eof
|
||||
|
||||
ActiveResource::HttpMock.respond_to do |mock|
|
||||
mock.get "/people/1.xml", {}, @matz
|
||||
mock.get "/people/2.xml", {}, @david
|
||||
mock.get "/people/5.xml", {}, @marty
|
||||
mock.get "/people/Greg.xml", {}, @greg
|
||||
mock.get "/people/4.xml", {'key' => 'value'}, nil, 404
|
||||
mock.put "/people/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1.xml", {}, nil, 200
|
||||
mock.delete "/people/2.xml", {}, nil, 400
|
||||
mock.get "/people/99.xml", {}, nil, 404
|
||||
mock.post "/people.xml", {}, @rick, 201, 'Location' => '/people/5.xml'
|
||||
mock.get "/people.xml", {}, @people
|
||||
mock.get "/people/1/addresses.xml", {}, @addresses
|
||||
mock.get "/people/1/addresses/1.xml", {}, @addy
|
||||
mock.get "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses.xml", {}, nil, 404
|
||||
mock.get "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.get "/people/Greg/addresses/1.xml", {}, @addy
|
||||
mock.put "/people/1/addresses/1.xml", {}, nil, 204
|
||||
mock.delete "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.post "/people/1/addresses.xml", {}, nil, 201, 'Location' => '/people/1/addresses/5'
|
||||
mock.get "/people//addresses.xml", {}, nil, 404
|
||||
mock.get "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.put "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.delete "/people//addresses/1.xml", {}, nil, 404
|
||||
mock.post "/people//addresses.xml", {}, nil, 404
|
||||
mock.head "/people/1.xml", {}, nil, 200
|
||||
mock.head "/people/Greg.xml", {}, nil, 200
|
||||
mock.head "/people/99.xml", {}, nil, 404
|
||||
mock.head "/people/1/addresses/1.xml", {}, nil, 200
|
||||
mock.head "/people/1/addresses/2.xml", {}, nil, 404
|
||||
mock.head "/people/2/addresses/1.xml", {}, nil, 404
|
||||
mock.head "/people/Greg/addresses/1.xml", {}, nil, 200
|
||||
# customer
|
||||
mock.get "/customers/1.xml", {}, @luis
|
||||
end
|
||||
|
||||
Person.user = nil
|
||||
Person.password = nil
|
||||
setup_response # find me in abstract_unit
|
||||
end
|
||||
|
||||
def test_find_by_id
|
||||
|
|
|
|||
Loading…
Reference in a new issue