From c5583a0e7e279f3d049a09ff5f0baad770cc8397 Mon Sep 17 00:00:00 2001 From: geemus Date: Mon, 3 Jan 2011 13:36:31 -0800 Subject: [PATCH] change params to attributes --- tests/dns/models/record_tests.rb | 6 +++--- tests/dns/models/records_tests.rb | 8 ++++---- tests/dns/models/zone_tests.rb | 6 +++--- tests/dns/models/zones_tests.rb | 6 +++--- tests/storage/models/directories_tests.rb | 6 +++--- tests/storage/models/directory_test.rb | 6 +++--- tests/storage/models/file_tests.rb | 6 +++--- tests/storage/models/files_tests.rb | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/dns/models/record_tests.rb b/tests/dns/models/record_tests.rb index 86491db4b..06f4bc602 100644 --- a/tests/dns/models/record_tests.rb +++ b/tests/dns/models/record_tests.rb @@ -2,16 +2,16 @@ for provider, config in dns_providers Shindo.tests("#{provider}::DNS | record", [provider.to_s.downcase]) do - params = { + attributes = { :ip => '1.2.3.4', :name => 'www.fogrecordtests.com', :type => 'A' - }.merge!(config[:record_params] || {}) + }.merge!(config[:record_attributes] || {}) if !Fog.mocking? || config[:mocked] @zone = provider[:dns].zones.create(:domain => 'fogrecordtests.com') - model_tests(@zone.records, params, config[:mocked]) + model_tests(@zone.records, attributes, config[:mocked]) @zone.destroy end diff --git a/tests/dns/models/records_tests.rb b/tests/dns/models/records_tests.rb index ec152bd9e..f4ff364b3 100644 --- a/tests/dns/models/records_tests.rb +++ b/tests/dns/models/records_tests.rb @@ -2,16 +2,16 @@ for provider, config in dns_providers Shindo.tests("#{provider}::DNS | records", [provider.to_s.downcase]) do - params = { + attributes = { :ip => '1.2.3.4', :name => 'www.fogrecordstests.com', :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') - collection_tests(@zone.records, params, config[:mocked]) + collection_tests(@zone.records, attributes, config[:mocked]) @zone.destroy end diff --git a/tests/dns/models/zone_tests.rb b/tests/dns/models/zone_tests.rb index 357087c41..f6537a96f 100644 --- a/tests/dns/models/zone_tests.rb +++ b/tests/dns/models/zone_tests.rb @@ -2,11 +2,11 @@ for provider, config in dns_providers Shindo.tests("#{provider}::DNS | zone", [provider.to_s.downcase]) do - params = { + attributes = { :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 diff --git a/tests/dns/models/zones_tests.rb b/tests/dns/models/zones_tests.rb index dd469832a..450466fa0 100644 --- a/tests/dns/models/zones_tests.rb +++ b/tests/dns/models/zones_tests.rb @@ -2,11 +2,11 @@ for provider, config in dns_providers Shindo.tests("#{provider}::DNS | zones", [provider.to_s.downcase]) do - params = { + attributes = { :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 diff --git a/tests/storage/models/directories_tests.rb b/tests/storage/models/directories_tests.rb index 2a7e846ab..c6caaf6fb 100644 --- a/tests/storage/models/directories_tests.rb +++ b/tests/storage/models/directories_tests.rb @@ -2,11 +2,11 @@ for provider, config in storage_providers Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do - params = { + attributes = { :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 diff --git a/tests/storage/models/directory_test.rb b/tests/storage/models/directory_test.rb index 3e2e6af82..fbc055ffc 100644 --- a/tests/storage/models/directory_test.rb +++ b/tests/storage/models/directory_test.rb @@ -2,11 +2,11 @@ for provider, config in storage_providers Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do - params = { + attributes = { :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 pending if Fog.mocking? && !config[:mocked] diff --git a/tests/storage/models/file_tests.rb b/tests/storage/models/file_tests.rb index a9b83e172..de50e7bda 100644 --- a/tests/storage/models/file_tests.rb +++ b/tests/storage/models/file_tests.rb @@ -2,17 +2,17 @@ for provider, config in storage_providers Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do - params = { + attributes = { :key => 'fog_file_tests', :body => lorem_file, :public => true - }.merge!(config[:directory_params] || {}) + }.merge!(config[:directory_attributes] || {}) if !Fog.mocking? || config[:mocked] @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) diff --git a/tests/storage/models/files_tests.rb b/tests/storage/models/files_tests.rb index 9be99199a..1167ceb87 100644 --- a/tests/storage/models/files_tests.rb +++ b/tests/storage/models/files_tests.rb @@ -2,16 +2,16 @@ for provider, config in storage_providers Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do - params = { + attributes = { :key => 'fog_files_tests', :body => lorem_file - }.merge!(config[:files_params] || {}) + }.merge!(config[:files_attributes] || {}) if !Fog.mocking? || config[:mocked] @directory = provider.directories.create(:key => 'fogfilestests') - collection_tests(@directory.files, params, config[:mocked]) + collection_tests(@directory.files, attributes, config[:mocked]) @directory.destroy