change params to attributes

This commit is contained in:
geemus 2011-01-03 13:36:31 -08:00
parent ed153088d0
commit c5583a0e7e
8 changed files with 25 additions and 25 deletions

View File

@ -2,16 +2,16 @@ for provider, config in dns_providers
Shindo.tests("#{provider}::DNS | record", [provider.to_s.downcase]) do Shindo.tests("#{provider}::DNS | record", [provider.to_s.downcase]) do
params = { attributes = {
:ip => '1.2.3.4', :ip => '1.2.3.4',
:name => 'www.fogrecordtests.com', :name => 'www.fogrecordtests.com',
:type => 'A' :type => 'A'
}.merge!(config[:record_params] || {}) }.merge!(config[:record_attributes] || {})
if !Fog.mocking? || config[:mocked] if !Fog.mocking? || config[:mocked]
@zone = provider[:dns].zones.create(:domain => 'fogrecordtests.com') @zone = provider[:dns].zones.create(:domain => 'fogrecordtests.com')
model_tests(@zone.records, params, config[:mocked]) model_tests(@zone.records, attributes, config[:mocked])
@zone.destroy @zone.destroy
end end

View File

@ -2,16 +2,16 @@ for provider, config in dns_providers
Shindo.tests("#{provider}::DNS | records", [provider.to_s.downcase]) do Shindo.tests("#{provider}::DNS | records", [provider.to_s.downcase]) do
params = { attributes = {
:ip => '1.2.3.4', :ip => '1.2.3.4',
:name => 'www.fogrecordstests.com', :name => 'www.fogrecordstests.com',
:type => 'A' :type => 'A'
}.merge!(config[:records_params] || {}) }.merge!(config[:records_attributes] || {})
if !Fog.mocking? || config[:mocked] if !Fog.mocking? || configa[:mocked]
@zone = provider[:dns].zones.create(:domain => 'fogrecordstests.com') @zone = provider[:dns].zones.create(:domain => 'fogrecordstests.com')
collection_tests(@zone.records, params, config[:mocked]) collection_tests(@zone.records, attributes, config[:mocked])
@zone.destroy @zone.destroy
end end

View File

@ -2,11 +2,11 @@ for provider, config in dns_providers
Shindo.tests("#{provider}::DNS | zone", [provider.to_s.downcase]) do Shindo.tests("#{provider}::DNS | zone", [provider.to_s.downcase]) do
params = { attributes = {
:domain => 'fogzonetests.com' :domain => 'fogzonetests.com'
}.merge!(config[:zone_params] || {}) }.merge!(config[:zone_attributes] || {})
model_tests(provider[:dns].zones, params, config[:mocked]) model_tests(provider[:dns].zones, attributes, config[:mocked])
end end

View File

@ -2,11 +2,11 @@ for provider, config in dns_providers
Shindo.tests("#{provider}::DNS | zones", [provider.to_s.downcase]) do Shindo.tests("#{provider}::DNS | zones", [provider.to_s.downcase]) do
params = { attributes = {
:domain => 'fogzonestests.com' :domain => 'fogzonestests.com'
}.merge!(config[:zones_params] || {}) }.merge!(config[:zones_attributes] || {})
collection_tests(provider[:dns].zones, params, config[:mocked]) collection_tests(provider[:dns].zones, attributes, config[:mocked])
end end

View File

@ -2,11 +2,11 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do
params = { attributes = {
:key => 'fogdirectoriestests', :key => 'fogdirectoriestests',
}.merge!(config[:directories_params] || {}) }.merge!(config[:directories_attributes] || {})
collection_tests(provider[:storage].directories, params, config[:mocked]) collection_tests(provider[:storage].directories, attributes, config[:mocked])
end end

View File

@ -2,11 +2,11 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do
params = { attributes = {
:key => 'fogdirectorytests' :key => 'fogdirectorytests'
}.merge!(config[:directory_params] || {}) }.merge!(config[:directory_attributes] || {})
model_tests(provider[:storage].directory, params, config[:mocked]) do model_tests(provider[:storage].directory, attributes, config[:mocked]) do
tests("#public=(true)").succeeds do tests("#public=(true)").succeeds do
pending if Fog.mocking? && !config[:mocked] pending if Fog.mocking? && !config[:mocked]

View File

@ -2,17 +2,17 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do
params = { attributes = {
:key => 'fog_file_tests', :key => 'fog_file_tests',
:body => lorem_file, :body => lorem_file,
:public => true :public => true
}.merge!(config[:directory_params] || {}) }.merge!(config[:directory_attributes] || {})
if !Fog.mocking? || config[:mocked] if !Fog.mocking? || config[:mocked]
@directory = provider[:storage].directories.create(:key => 'fogfilestests') @directory = provider[:storage].directories.create(:key => 'fogfilestests')
model_tests(@directory.files, params, config[:mocked]) do model_tests(@directory.files, attributes, config[:mocked]) do
responds_to(:public_url) responds_to(:public_url)

View File

@ -2,16 +2,16 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do
params = { attributes = {
:key => 'fog_files_tests', :key => 'fog_files_tests',
:body => lorem_file :body => lorem_file
}.merge!(config[:files_params] || {}) }.merge!(config[:files_attributes] || {})
if !Fog.mocking? || config[:mocked] if !Fog.mocking? || config[:mocked]
@directory = provider.directories.create(:key => 'fogfilestests') @directory = provider.directories.create(:key => 'fogfilestests')
collection_tests(@directory.files, params, config[:mocked]) collection_tests(@directory.files, attributes, config[:mocked])
@directory.destroy @directory.destroy