diff --git a/tests/rackspace/compute_v2_tests.rb b/tests/rackspace/compute_v2_tests.rb index 62ca47d48..3d0d9e63f 100644 --- a/tests/rackspace/compute_v2_tests.rb +++ b/tests/rackspace/compute_v2_tests.rb @@ -1,5 +1,5 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do - + def assert_method(url, method) @service.instance_variable_set "@rackspace_auth_url", url returns(method) { @service.send :authentication_method } @@ -7,22 +7,22 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do tests('#authentication_method') do @service = Fog::Compute::RackspaceV2.new - + assert_method nil, :authenticate_v2 assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1 assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1 - assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1 + assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1 assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2 - - assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1 + + assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1 assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1 assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1 assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2 end - + tests('legacy authentication') do pending if Fog.mocking? @@ -33,9 +33,9 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? } @service.list_flavors end - + tests('custom endpoint') do - @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', + @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', :rackspace_compute_url => 'https://my-custom-endpoint.com' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } @@ -44,7 +44,7 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do tests('current authentation') do pending if Fog.mocking? - + tests('variables populated').succeeds do @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true} returns(true, "auth token populated") { !@service.send(:auth_token).nil? } @@ -67,16 +67,16 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do @service.list_flavors end tests('custom endpoint') do - @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', + @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_compute_url => 'https://my-custom-endpoint.com' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } end end - + tests('default auth') do pending if Fog.mocking? - + tests('no params').succeeds do @service = Fog::Compute::RackspaceV2.new returns(true, "auth token populated") { !@service.send(:auth_token).nil? } @@ -93,14 +93,14 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil } @service.list_flavors - end + end tests('custom endpoint') do @service = Fog::Compute::RackspaceV2.new :rackspace_compute_url => 'https://my-custom-endpoint.com' returns(true, "auth token populated") { !@service.send(:auth_token).nil? } returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil } end end - + tests('reauthentication') do pending if Fog.mocking? @@ -110,4 +110,4 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do returns(true) { [200, 203].include? @service.list_flavors.status } end -end \ No newline at end of file +end