From bb007dbd751b149b812d7cfa098759a6b7b463a8 Mon Sep 17 00:00:00 2001 From: geemus Date: Mon, 3 Jan 2011 11:28:16 -0800 Subject: [PATCH] fix loading/naming of shared tests --- tests/helper.rb | 15 +-------------- .../{collection_tests.rb => collection_helper.rb} | 0 .../{flavors_tests.rb => flavors_helper.rb} | 0 .../compute/{server_tests.rb => server_helper.rb} | 0 .../{servers_tests.rb => servers_helper.rb} | 0 tests/helpers/{model_tests.rb => model_helper.rb} | 0 6 files changed, 1 insertion(+), 14 deletions(-) rename tests/helpers/{collection_tests.rb => collection_helper.rb} (100%) rename tests/helpers/compute/{flavors_tests.rb => flavors_helper.rb} (100%) rename tests/helpers/compute/{server_tests.rb => server_helper.rb} (100%) rename tests/helpers/compute/{servers_tests.rb => servers_helper.rb} (100%) rename tests/helpers/{model_tests.rb => model_helper.rb} (100%) diff --git a/tests/helper.rb b/tests/helper.rb index 322b68284..7f4ed7455 100644 --- a/tests/helper.rb +++ b/tests/helper.rb @@ -1,20 +1,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog') require 'fog/core/bin' -__DIR__ = File.dirname(__FILE__) - -$LOAD_PATH.unshift __DIR__ unless - $LOAD_PATH.include?(__DIR__) || - $LOAD_PATH.include?(File.expand_path(__DIR__)) - -require 'helpers/collection_tests' -require 'helpers/model_tests' - -require 'helpers/compute/flavors_tests' -require 'helpers/compute/server_tests' -require 'helpers/compute/servers_tests' - -# Use so you can run in mock mode from the command line: +# Use so you can run in mock mode from the command line # # FOG_MOCK=true fog diff --git a/tests/helpers/collection_tests.rb b/tests/helpers/collection_helper.rb similarity index 100% rename from tests/helpers/collection_tests.rb rename to tests/helpers/collection_helper.rb diff --git a/tests/helpers/compute/flavors_tests.rb b/tests/helpers/compute/flavors_helper.rb similarity index 100% rename from tests/helpers/compute/flavors_tests.rb rename to tests/helpers/compute/flavors_helper.rb diff --git a/tests/helpers/compute/server_tests.rb b/tests/helpers/compute/server_helper.rb similarity index 100% rename from tests/helpers/compute/server_tests.rb rename to tests/helpers/compute/server_helper.rb diff --git a/tests/helpers/compute/servers_tests.rb b/tests/helpers/compute/servers_helper.rb similarity index 100% rename from tests/helpers/compute/servers_tests.rb rename to tests/helpers/compute/servers_helper.rb diff --git a/tests/helpers/model_tests.rb b/tests/helpers/model_helper.rb similarity index 100% rename from tests/helpers/model_tests.rb rename to tests/helpers/model_helper.rb