[rackspace] consolidate image tests

lib/fog/rackspace/requests/servers/delete_image.rb

@@ -31,11 +31,12 @@ module Fog
               @data[:images].delete(image_id)
               response.status = 202
             end
+            response
           else
             response.status = 400
             raise(Excon::Errors.status_error({:expects => 202}, response))
           end
-          response
+
         end
 
       end

tests/rackspace/helper.rb

@@ -27,16 +27,6 @@ module Rackspace
 
     module Formats
 
-      IMAGE = {
-        'created'   => String,
-        'id'        => Integer,
-        'name'      => String,
-        'progress'  => Integer,
-        'serverId'  => Integer,
-        'status'    => String,
-        'updated'   => String
-      }
-
       SUMMARY = {
         'id'    => Integer,
         'name'  => String

tests/rackspace/requests/servers/create_image_tests.rb

@@ -1,20 +0,0 @@
-Shindo.tests('Rackspace::Servers#create_image', 'rackspace') do
-  tests('success') do
-
-    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
-    @server.wait_for { ready? }
-    @image_id = nil
-
-    tests("#create_image(#{@server.id})").formats(Rackspace::Servers::Formats::IMAGE.reject {|key,value| key == 'progress'}) do
-      data = Rackspace[:servers].create_image(@server.id).body['image']
-      @image_id = data['id']
-      data
-    end
-
-    @image = Rackspace[:servers].images.get(@image_id)
-    @image.wait_for { ready? }
-    @image.destroy
-    @server.destroy
-
-  end
-end

tests/rackspace/requests/servers/delete_image_tests.rb

@@ -1,23 +0,0 @@
-Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
-  tests('success') do
-
-    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
-    @server.wait_for { ready? }
-    @image = Rackspace[:servers].images.create(:server_id => @server.id)
-    @image.wait_for { ready? }
-
-    tests("#delete_image(#{@image.identity})").succeeds do
-      Rackspace[:servers].delete_image(@image.identity)
-    end
-
-    @server.destroy
-
-  end
-  tests('failure') do
-
-    tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
-      Rackspace[:servers].delete_image(0)
-    end
-
-  end
-end

tests/rackspace/requests/servers/get_image_details_tests.rb

@@ -1,16 +0,0 @@
-Shindo.tests('Rackspace::Servers#get_image_details', 'rackspace') do
-  tests('success') do
-
-    tests('#get_image_details(19)').formats(Rackspace::Servers::Formats::IMAGE.reject {|key, value| ['progress', 'serverId'].include?(key)}) do
-      Rackspace[:servers].get_image_details(19).body['image']
-    end
-
-  end
-  tests('failure') do
-
-    tests('#get_image_details(0)').raises(Excon::Errors::NotFound) do
-      Rackspace[:servers].get_image_details(0)
-    end
-
-  end
-end

tests/rackspace/requests/servers/image_tests.rb

@@ -0,0 +1,59 @@
+Shindo.tests('Rackspace::Servers | image requests', ['rackspace']) do
+
+  @image_format = {
+    'created'   => String,
+    'id'        => Integer,
+    'name'      => String,
+    'progress'  => Integer,
+    'serverId'  => Integer,
+    'status'    => String,
+    'updated'   => String
+  }
+
+  tests('success') do
+
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
+    @server.wait_for { ready? }
+    @image_id = nil
+
+    tests("#create_image(#{@server.id})").formats(@image_format.reject {|key,value| key == 'progress'}) do
+      data = Rackspace[:servers].create_image(@server.id).body['image']
+      @image_id = data['id']
+      data
+    end
+
+    Rackspace[:servers].images.get(@image_id).wait_for { ready? }
+
+    tests("#get_image_details(#{@image_id})").formats(@image_format) do
+      Rackspace[:servers].get_image_details(@image_id).body['image']
+    end
+
+    tests('#list_images').formats({'images' => [Rackspace::Servers::Formats::SUMMARY]}) do
+      Rackspace[:servers].list_images.body
+    end
+
+    tests('#list_images_detail').formats({'images' => [@image_format]}) do
+      Rackspace[:servers].list_images_detail.body
+    end
+
+    tests("#delete_image(#{@image_id})").succeeds do
+      Rackspace[:servers].delete_image(@image_id)
+    end
+
+    @server.destroy
+
+  end
+
+  tests('failure') do
+
+    tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
+      Rackspace[:servers].delete_image(0)
+    end
+
+    tests('#get_image_details(0)').raises(Fog::Rackspace::Servers::NotFound) do
+      Rackspace[:servers].get_image_details(0)
+    end
+
+  end
+
+end

tests/rackspace/requests/servers/list_images_detail_tests.rb

@@ -1,9 +0,0 @@
-Shindo.tests('Rackspace::Servers#list_images_detail', 'rackspace') do
-  tests('success') do
-
-    tests('#list_images_detail').formats({'images' => [Rackspace::Servers::Formats::IMAGE]}) do
-      Rackspace[:servers].list_images_detail.body
-    end
-
-  end
-end

tests/rackspace/requests/servers/list_images_tests.rb

@@ -1,9 +0,0 @@
-Shindo.tests('Rackspace::Servers#list_images', 'rackspace') do
-  tests('success') do
-
-    tests('#list_images').formats({'images' => [Rackspace::Servers::Formats::SUMMARY]}) do
-      Rackspace[:servers].list_images.body
-    end
-
-  end
-end