From ca360be0ed43baf9908289695c6bd95453f44491 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Tue, 24 May 2011 17:32:27 -0700
Subject: [PATCH] [local|storage] fixes for pending mocked tests
---
tests/helpers/mock_helper.rb | 2 +-
tests/storage/helper.rb | 2 +-
tests/storage/models/directories_tests.rb | 12 +++++++----
tests/storage/models/directory_test.rb | 26 +++++++++++++----------
tests/storage/models/file_tests.rb | 12 +++++------
tests/storage/models/files_tests.rb | 10 ++++-----
6 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/tests/helpers/mock_helper.rb b/tests/helpers/mock_helper.rb
index cc77aa493..d71fd9c66 100644
--- a/tests/helpers/mock_helper.rb
+++ b/tests/helpers/mock_helper.rb
@@ -25,7 +25,7 @@ if Fog.mock?
:google_storage_access_key_id => 'google_storage_access_key_id',
:google_storage_secret_access_key => 'google_storage_secret_access_key',
:linode_api_key => 'linode_api_key',
-# :local_root => '~/.fog'
+ :local_root => '~/.fog',
:new_servers_password => 'new_servers_password',
:new_servers_username => 'new_servers_username',
# :public_key_path => '~/.ssh/id_rsa.pub',
diff --git a/tests/storage/helper.rb b/tests/storage/helper.rb
index 4760bfb9f..3c60826cf 100644
--- a/tests/storage/helper.rb
+++ b/tests/storage/helper.rb
@@ -7,7 +7,7 @@ def storage_providers
:mocked => true
},
Local => {
- :mocked => true
+ :mocked => false
},
Rackspace => {
:mocked => false
diff --git a/tests/storage/models/directories_tests.rb b/tests/storage/models/directories_tests.rb
index 019f53314..f64a0abad 100644
--- a/tests/storage/models/directories_tests.rb
+++ b/tests/storage/models/directories_tests.rb
@@ -2,11 +2,15 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directories", [provider.to_s.downcase]) do
- directory_attributes = {
- :key => 'fogdirectoriestests',
- }.merge!(config[:directory_attributes] || {})
+ if !Fog.mocking? || config[:mocked]
- collection_tests(provider[:storage].directories, directory_attributes, config[:mocked])
+ directory_attributes = {
+ :key => 'fogdirectoriestests',
+ }.merge!(config[:directory_attributes] || {})
+
+ collection_tests(provider[:storage].directories, directory_attributes, config[:mocked])
+
+ end
end
diff --git a/tests/storage/models/directory_test.rb b/tests/storage/models/directory_test.rb
index 833597cbc..e5e8da21d 100644
--- a/tests/storage/models/directory_test.rb
+++ b/tests/storage/models/directory_test.rb
@@ -2,20 +2,24 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | directory", [provider.to_s.downcase]) do
- directory_attributes = {
- :key => 'fogdirectorytests'
- }.merge!(config[:directory_attributes] || {})
+ if !Fog.mocking? || config[:mocked]
- model_tests(provider[:storage].directory, directory_attributes, config[:mocked]) do
+ directory_attributes = {
+ :key => 'fogdirectorytests'
+ }.merge!(config[:directory_attributes] || {})
- tests("#public=(true)").succeeds do
- pending if Fog.mocking? && !config[:mocked]
- @instance.public=(true)
- end
+ model_tests(provider[:storage].directory, directory_attributes, config[:mocked]) do
+
+ tests("#public=(true)").succeeds do
+ pending if Fog.mocking? && !config[:mocked]
+ @instance.public=(true)
+ end
+
+ tests('responds_to(:public_url)') do
+ pending if Fog.mocking? && !config[:mocked]
+ @instance.responds_to(:public_url)
+ end
- tests('responds_to(:public_url)') do
- pending if Fog.mocking? && !config[:mocked]
- @instance.responds_to(:public_url)
end
end
diff --git a/tests/storage/models/file_tests.rb b/tests/storage/models/file_tests.rb
index 4c9972518..6c122377d 100644
--- a/tests/storage/models/file_tests.rb
+++ b/tests/storage/models/file_tests.rb
@@ -2,14 +2,14 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | file", [provider.to_s.downcase]) do
- file_attributes = {
- :key => 'fog_file_tests',
- :body => lorem_file,
- :public => true
- }.merge!(config[:file_attributes] || {})
-
if !Fog.mocking? || config[:mocked]
+ file_attributes = {
+ :key => 'fog_file_tests',
+ :body => lorem_file,
+ :public => true
+ }.merge!(config[:file_attributes] || {})
+
directory_attributes = {
:key => 'fogfilestests'
}.merge!(config[:directory_attributes] || {})
diff --git a/tests/storage/models/files_tests.rb b/tests/storage/models/files_tests.rb
index 2d69a0c66..284df7fc4 100644
--- a/tests/storage/models/files_tests.rb
+++ b/tests/storage/models/files_tests.rb
@@ -2,13 +2,13 @@ for provider, config in storage_providers
Shindo.tests("#{provider}::Storage | files", [provider.to_s.downcase]) do
- file_attributes = {
- :key => 'fog_files_tests',
- :body => lorem_file
- }.merge!(config[:file_attributes] || {})
-
if !Fog.mocking? || config[:mocked]
+ file_attributes = {
+ :key => 'fog_files_tests',
+ :body => lorem_file
+ }.merge!(config[:file_attributes] || {})
+
directory_attributes = {
:key => 'fogfilestests'
}.merge!(config[:directory_attributes] || {})