From 604b4a625f6e282df09acef90a2d5b5022a84ff2 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Wed, 26 Jun 2013 09:27:43 -0500 Subject: [PATCH] [rackspace|block_storage] fixing broken volume type tests --- .../requests/block_storage/volume_type_tests.rb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/rackspace/requests/block_storage/volume_type_tests.rb b/tests/rackspace/requests/block_storage/volume_type_tests.rb index 83d2aac31..00e050fb5 100644 --- a/tests/rackspace/requests/block_storage/volume_type_tests.rb +++ b/tests/rackspace/requests/block_storage/volume_type_tests.rb @@ -1,15 +1,8 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume_type_tests', ['rackspace']) do volume_type_format = { 'name' => String, - 'extra_specs' => Hash - } - - list_volume_type_format = { - 'volume_types' => [volume_type_format.merge({ 'id' => Integer })] - } - - get_volume_type_format = { - 'volume_type' => volume_type_format.merge({ 'id' => String }) + 'extra_specs' => Hash, + 'id' => String } service = Fog::Rackspace::BlockStorage.new @@ -17,11 +10,11 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume_type_tests', ['rackspace']) tests('success') do volume_type_id = service.volume_types.first.id - tests("#list_volume_types").formats(list_volume_type_format) do + tests("#list_volume_types").formats('volume_types' => [volume_type_format]) do service.list_volume_types.body end - tests("#get_volume_type(#{volume_type_id})").formats(get_volume_type_format) do + tests("#get_volume_type(#{volume_type_id})").formats('volume_type' => volume_type_format) do service.get_volume_type(volume_type_id).body end end