fog 0.1.0 → 0.1.1

data/tests/rackspace/requests/servers/delete_image_tests.rb

@@ -1,28 +1,22 @@
 Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogdeleteimage').body['server']['id']
-      @image_id = Rackspace[:servers].create_image(@server_id).body['image']['id']
-    end
+    @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? }
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#delete_image(#{@image.identity})").succeeds do
+      Rackspace[:servers].delete_image(@image.identity)
     end
 
-    test('has proper output format') do
-      Fog.wait_for { Rackspace[:servers].get_image_details(@image_id).body['image']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_image(@image_id)
-    end
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if image does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].delete_image(0)
-      end
+    tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
+      Rackspace[:servers].delete_image(0)
     end
 
   end

data/tests/rackspace/requests/servers/delete_server_tests.rb

@@ -1,22 +1,18 @@
 Shindo.tests('Rackspace::Servers#delete_server', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogdeleteserver').body['server']['id']
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
+    @server.wait_for { ready? }
 
-    test('has proper output format') do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#delete_server(#{@server.id})").succeeds do
+      Rackspace[:servers].delete_server(@server.id)
     end
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].delete_server(0)
-      end
+    tests('#delete_server(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].delete_server(0)
     end
 
   end

data/tests/rackspace/requests/servers/get_flavor_details_tests.rb

@@ -1,21 +1,15 @@
 Shindo.tests('Rackspace::Servers#get_flavor_details', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].get_flavor_details(1).body['flavor']
-    end
-
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::FLAVOR)
+    tests('#get_flavor_details(1)').formats(Rackspace::Servers::Formats::FLAVOR) do
+      Rackspace[:servers].get_flavor_details(1).body['flavor']
     end
 
   end
   tests('failure') do
 
-    test('raises NotFound error if flavor does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].get_flavor_details(0)
-      end
+    tests('#get_flavor_details(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].get_flavor_details(0)
     end
 
   end

data/tests/rackspace/requests/servers/get_image_details_tests.rb

@@ -1,21 +1,15 @@
 Shindo.tests('Rackspace::Servers#get_image_details', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].get_image_details(3).body['image']
-    end
-
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::IMAGE)
+    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
 
-    test('raises NotFound error if image does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].get_image_details(0)
-      end
+    tests('#get_image_details(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].get_image_details(0)
     end
 
   end

data/tests/rackspace/requests/servers/get_server_details_tests.rb

@@ -1,27 +1,20 @@
 Shindo.tests('Rackspace::Servers#get_server_details', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foggetserverdetails').body['server']['id']
-      @data = Rackspace[:servers].get_server_details(@server_id).body['server']
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#get_server_details(#{@server.id})").formats(Rackspace::Servers::Formats::SERVER) do
+      Rackspace[:servers].get_server_details(@server.id).body['server']
     end
 
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::SERVER)
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].get_server_details(0)
-      end
+    tests('#get_server_details(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].get_server_details(0)
     end
 
   end

data/tests/rackspace/requests/servers/list_addresses_tests.rb

@@ -1,27 +1,20 @@
 Shindo.tests('Rackspace::Servers#list_addresses', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistaddresses').body['server']['id']
-      @data = Rackspace[:servers].list_addresses(@server_id).body
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistaddresses')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#list_addresses(#{@server.id})").formats({'addresses' => {'private' => [String], 'public' => [String]}}) do
+      Rackspace[:servers].list_addresses(@server.id).body
     end
 
-    test('has proper output format') do
-      has_format(@data, {'private' => [String], 'public' => [String]})
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].list_addresses(0)
-      end
+    tests('#list_addresses(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].list_addresses(0)
     end
 
   end

data/tests/rackspace/requests/servers/list_flavors_detail_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Rackspace::Servers#list_flavors_detail', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].list_flavors_detail.body['flavors']
-    end
-
-    test('has proper output format') do
-      has_format(@data, [Rackspace::Servers::Formats::FLAVOR])
+    tests('#list_flavors_detail').formats({'flavors' => [Rackspace::Servers::Formats::FLAVOR]}) do
+      Rackspace[:servers].list_flavors_detail.body
     end
 
   end

data/tests/rackspace/requests/servers/list_flavors_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Rackspace::Servers#list_flavors', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].list_flavors.body['flavors']
-    end
-
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::SUMMARY)
+    tests('#list_flavors').formats({'flavors' => [Rackspace::Servers::Formats::SUMMARY]}) do
+      Rackspace[:servers].list_flavors.body
     end
 
   end

data/tests/rackspace/requests/servers/list_images_detail_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Rackspace::Servers#list_images_detail', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].list_images_detail.body['images']
-    end
-
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::IMAGE)
+    tests('#list_images_detail').formats({'images' => [Rackspace::Servers::Formats::IMAGE]})
+      Rackspace[:servers].list_images_detail.body
     end
 
   end

data/tests/rackspace/requests/servers/list_images_tests.rb

@@ -1,12 +1,8 @@
 Shindo.tests('Rackspace::Servers#list_images', 'rackspace') do
   tests('success') do
 
-    before do
-      @data = Rackspace[:servers].list_images.body['images']
-    end
-
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::SUMMARY)
+    tests('#list_images').formats({'images' => [Rackspace::Servers::Formats::SUMMARY]}) do
+      Rackspace[:servers].list_images.body
     end
 
   end

data/tests/rackspace/requests/servers/list_private_addresses_tests.rb

@@ -1,27 +1,20 @@
 Shindo.tests('Rackspace::Servers#list_private_addresses', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistprivateaddresses').body['server']['id']
-      @data = Rackspace[:servers].list_private_addresses(@server_id).body
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistprivateaddresses')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#list_private_addresses(#{@server.id})").formats({'private' => [String]}) do
+      Rackspace[:servers].list_private_addresses(@server.id).body
     end
 
-    test('has proper output format') do
-      has_format(@data, [String])
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].list_private_addresses(0)
-      end
+    tests('#list_private_addresses(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].list_private_addresses(0)
     end
 
   end

data/tests/rackspace/requests/servers/list_public_addresses_tests.rb

@@ -1,27 +1,20 @@
 Shindo.tests('Rackspace::Servers#list_public_addresses', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistpublicaddresses').body['server']['id']
-      @data = Rackspace[:servers].list_public_addresses(@server_id).body
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistpublicaddresses')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#list_public_addresses(#{@server.id})").formats({'public' => [String]}) do
+      Rackspace[:servers].list_public_addresses(@server.id).body
     end
 
-    test('has proper output format') do
-      has_format(@data, [String])
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].list_public_addresses(0)
-      end
+    tests('#list_public_addresses(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].list_public_addresses(0)
     end
 
   end

data/tests/rackspace/requests/servers/list_servers_detail_tests.rb

@@ -1,19 +1,14 @@
 Shindo.tests('Rackspace::Servers#list_servers_detail', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistserversdetail').body['server']['id']
-      @data = Rackspace[:servers].list_servers_detail.body['servers']
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistserversdetail')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests('#list_servers_detail').formats({'servers' => [Rackspace::Servers::Formats::SERVER]}) do
+      Rackspace[:servers].list_servers_detail.body
     end
 
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::SERVER)
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
 end

data/tests/rackspace/requests/servers/list_servers_tests.rb

@@ -1,19 +1,14 @@
 Shindo.tests('Rackspace::Servers#list_servers', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistservers').body['server']['id']
-      @data = Rackspace[:servers].list_servers.body['servers']
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistservers')
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests('#list_servers').formats({'servers' => [Rackspace::Servers::Formats::SUMMARY]}) do
+      Rackspace[:servers].list_servers.body
     end
 
-    test('has proper output format') do
-      has_format(@data, Rackspace::Servers::Formats::SUMMARY)
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
 end

data/tests/rackspace/requests/servers/reboot_server_tests.rb

@@ -1,36 +1,28 @@
 Shindo.tests('Rackspace::Servers#reboot_server', 'rackspace') do
   tests('success') do
 
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'fogrebootserver')
+
     before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogrebootserver').body['server']['id']
+      @server.wait_for { ready? }
     end
 
-    after do
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#reboot_server(#{@server.id}, 'HARD')").succeeds do
+      Rackspace[:servers].reboot_server(@server.id, 'HARD')
     end
 
-    tests('HARD') do
-      test('has proper output format') do
-        Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-        Rackspace[:servers].reboot_server(@server_id, 'HARD')
-      end
+    tests("#reboot_server(#{@server.id}, 'SOFT')").succeeds do
+      Rackspace[:servers].reboot_server(@server.id, 'SOFT')
     end
 
-    tests('SOFT') do
-      test('has proper output format') do
-        Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-        Rackspace[:servers].reboot_server(@server_id, 'SOFT')
-      end
-    end
+    @server.wait_for { ready? }
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].reboot_server(0)
-      end
+    tests('#reboot_server(0)').raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].reboot_server(0)
     end
 
   end

data/tests/rackspace/requests/servers/update_server_tests.rb

@@ -1,27 +1,20 @@
 Shindo.tests('Rackspace::Servers#update_server', 'rackspace') do
   tests('success') do
 
-    before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogupdateserver').body['server']['id']
-      Fog.wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
-      @data = Rackspace[:servers].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
-    end
+    @server = Rackspace[:servers].servers.create(:flavor_id => 1, :image_id => 19, :name => 'fogupdateserver')
+    @server.wait_for { ready? }
 
-    after do
-      Rackspace[:servers].delete_server(@server_id)
+    tests("#update_server(#{@server.id}, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").succeeds do
+      Rackspace[:servers].update_server(@server.id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
-    test('has proper output format') do
-      has_format(@data, {'name' => String, 'adminPass' => String})
-    end
+    @server.destroy
 
   end
   tests('failure') do
 
-    test('raises NotFound error if server does not exist') do
-      has_error(Excon::Errors::NotFound) do
-        Rackspace[:servers].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
-      end
+    tests("#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").raises(Excon::Errors::NotFound) do
+      Rackspace[:servers].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
   end