fog 0.3.31 → 0.3.32

data/tests/brightbox/requests/compute/account_tests.rb

@@ -2,28 +2,39 @@ Shindo.tests('Brightbox::Compute | account requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#get_account()").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
-      Brightbox[:compute].get_account()
+    tests("#get_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_account
+    end
+
+    unless Fog.mocking?
+      original_name = Brightbox[:compute].get_account["name"]
+      update_args = {:name => "New name from Fog test"}
     end
 
-    original_name = Brightbox[:compute].get_account["name"]
-    update_args = {:name => "New name from Fog test"}
     tests("#update_account(#{update_args.inspect})").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+      pending if Fog.mocking?
       Brightbox[:compute].update_account(update_args)
     end
-    Brightbox[:compute].update_account(:name => original_name)
 
-    tests("#reset_ftp_password_account()").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
-      Brightbox[:compute].reset_ftp_password_account()
+    unless Fog.mocking?
+      Brightbox[:compute].update_account(:name => original_name)
+    end
+
+    tests("#reset_ftp_password_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+      pending if Fog.mocking?
+      Brightbox[:compute].reset_ftp_password_account
     end
 
   end
 
   tests('failure') do
 
-    tests("#update_account()").returns(nil) do
-      Brightbox[:compute].update_account()
+    tests("#update_account").returns(nil) do
+      pending if Fog.mocking?
+      Brightbox[:compute].update_account
     end
+
   end
 
 end

data/tests/brightbox/requests/compute/api_client_tests.rb

@@ -3,25 +3,31 @@ Shindo.tests('Brightbox::Compute | api client requests', ['brightbox']) do
   tests('success') do
 
     create_options = {:name => "Name from Fog test (#{Time.now.to_i})", :description => "Description from Fog test"}
+
     tests("#create_api_client(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+      pending if Fog.mocking?
       data = Brightbox[:compute].create_api_client(create_options)
       @api_client_id = data["id"]
       data
     end
 
-    tests("#list_api_clients()").formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) do
-      Brightbox[:compute].list_api_clients()
+    tests("#list_api_clients").formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) do
+      pending if Fog.mocking?
+      Brightbox[:compute].list_api_clients
     end
 
     tests("#get_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_api_client(@api_client_id)
     end
 
     tests("#update_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+      pending if Fog.mocking?
       Brightbox[:compute].update_api_client(@api_client_id, :name => "New name from Fog test")
     end
 
     tests("#destroy_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
+      pending if Fog.mocking?
       Brightbox[:compute].destroy_api_client(@api_client_id)
     end
 
@@ -30,11 +36,13 @@ Shindo.tests('Brightbox::Compute | api client requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_api_client('cli-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_api_client('cli-00000')
     end
 
-    tests("#get_api_client()").raises(ArgumentError) do
-      Brightbox[:compute].get_api_client()
+    tests("#get_api_client").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_api_client
     end
   end
 

data/tests/brightbox/requests/compute/cloud_ip_tests.rb

@@ -3,33 +3,44 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
   tests('success') do
 
     tests("#create_cloud_ip()").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+      pending if Fog.mocking?
       data = Brightbox[:compute].create_cloud_ip()
       @cloud_ip_id = data["id"]
       data
     end
 
     tests("#list_cloud_ips()").formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) do
+      pending if Fog.mocking?
       Brightbox[:compute].list_cloud_ips()
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_cloud_ip(@cloud_ip_id)
     end
 
-    server = Brightbox[:compute].servers.first
-    interface_id = server.interfaces.first["id"]
-    map_options = {:interface => interface_id}
+    unless Fog.mocking?
+      server = Brightbox[:compute].servers.first
+      interface_id = server.interfaces.first["id"]
+      map_options = {:interface => interface_id}
+    end
+
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+      pending if Fog.mocking?
       Brightbox[:compute].map_cloud_ip(@cloud_ip_id, map_options)
     end
 
-    Brightbox[:compute].cloud_ips.get(@cloud_ip_id).wait_for { mapped? }
+    unless Fog.mocking?
+      Brightbox[:compute].cloud_ips.get(@cloud_ip_id).wait_for { mapped? }
+    end
 
     tests("#unmap_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+      pending if Fog.mocking?
       Brightbox[:compute].unmap_cloud_ip(@cloud_ip_id)
     end
 
     tests("#destroy_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
+      pending if Fog.mocking?
       Brightbox[:compute].destroy_cloud_ip(@cloud_ip_id)
     end
 
@@ -38,12 +49,15 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_cloud_ip('cip-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_cloud_ip('cip-00000')
     end
 
-    tests("#get_cloud_ip()").raises(ArgumentError) do
-      Brightbox[:compute].get_cloud_ip()
+    tests("#get_cloud_ip").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_cloud_ip
     end
+
   end
 
 end

data/tests/brightbox/requests/compute/image_tests.rb

@@ -15,13 +15,15 @@ Shindo.tests('Brightbox::Compute | image requests', ['brightbox']) do
 
     # Brightbox[:compute].images.get(@image_id).wait_for { ready? }
 
-    tests("#list_images()").formats(Brightbox::Compute::Formats::Collection::IMAGES) do
-      data = Brightbox[:compute].list_images()
+    tests("#list_images").formats(Brightbox::Compute::Formats::Collection::IMAGES) do
+      pending if Fog.mocking?
+      data = Brightbox[:compute].list_images
       @image_id = data.first["id"]
       data
     end
 
     tests("#get_image('#{@image_id}')").formats(Brightbox::Compute::Formats::Full::IMAGE) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_image(@image_id)
     end
 
@@ -41,12 +43,15 @@ Shindo.tests('Brightbox::Compute | image requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_image('img-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_image('img-00000')
     end
 
-    tests("#get_image()").raises(ArgumentError) do
-      Brightbox[:compute].get_image()
+    tests("#get_image").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_image
     end
+
   end
 
 end

data/tests/brightbox/requests/compute/interface_tests.rb

@@ -2,9 +2,13 @@ Shindo.tests('Brightbox::Compute | interface requests', ['brightbox']) do
 
   tests('success') do
 
-    server = Brightbox[:compute].servers.first
-    @interface_id = server.interfaces.first["id"]
+    unless Fog.mocking?
+      server = Brightbox[:compute].servers.first
+      @interface_id = server.interfaces.first["id"]
+    end
+
     tests("#get_interface('#{@interface_id}')").formats(Brightbox::Compute::Formats::Full::INTERFACE) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_interface(@interface_id)
     end
 
@@ -13,10 +17,12 @@ Shindo.tests('Brightbox::Compute | interface requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_interface('int-00000')").raises(Excon::Errors::Forbidden) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_interface('int-00000')
     end
 
     tests("#get_interface()").raises(ArgumentError) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_interface()
     end
   end

data/tests/brightbox/requests/compute/server_tests.rb

@@ -6,38 +6,48 @@ Shindo.tests('Brightbox::Compute | server requests', ['brightbox']) do
     server_id = nil
 
     tests("#create_server(:image => '#{image_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       data = Brightbox[:compute].create_server(:image => image_id)
       server_id = data["id"]
       data
     end
 
-    Brightbox[:compute].servers.get(server_id).wait_for { ready? }
+    unless Fog.mocking?
+      Brightbox[:compute].servers.get(server_id).wait_for { ready? }
+    end
 
-    tests("#list_servers()").formats(Brightbox::Compute::Formats::Collection::SERVERS) do
-      Brightbox[:compute].list_servers()
+    tests("#list_servers").formats(Brightbox::Compute::Formats::Collection::SERVERS) do
+      pending if Fog.mocking?
+      Brightbox[:compute].list_servers
     end
 
     tests("#get_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_server(server_id)
     end
 
     tests("#update_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].update_server(server_id, :name => "New name from Fog test")
     end
 
     tests("#stop_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].stop_server(server_id)
     end
 
     tests("#start_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].start_server(server_id)
     end
 
     tests("#shutdown_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].shutdown_server(server_id)
     end
 
     tests("#destroy_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
+      pending if Fog.mocking?
       Brightbox[:compute].destroy_server(server_id)
     end
 
@@ -46,11 +56,13 @@ Shindo.tests('Brightbox::Compute | server requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_server('srv-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_server('srv-00000')
     end
 
-    tests("#get_server()").raises(ArgumentError) do
-      Brightbox[:compute].get_server()
+    tests("#get_server").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_server
     end
   end
 

data/tests/brightbox/requests/compute/server_type_tests.rb

@@ -2,13 +2,15 @@ Shindo.tests('Brightbox::Compute | server type requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_server_types()").formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) do
-      data = Brightbox[:compute].list_server_types()
+    tests("#list_server_types").formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) do
+      pending if Fog.mocking?
+      data = Brightbox[:compute].list_server_types
       @server_type_id = data.first["id"]
       data
     end
 
     tests("#get_server_type('#{@server_type_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_server_type(@server_type_id)
     end
 
@@ -17,11 +19,13 @@ Shindo.tests('Brightbox::Compute | server type requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_server_type('typ-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_server_type('typ-00000')
     end
 
-    tests("#get_server()").raises(ArgumentError) do
-      Brightbox[:compute].get_server_type()
+    tests("#get_server").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_server_type
     end
   end
 

data/tests/brightbox/requests/compute/user_tests.rb

@@ -2,30 +2,38 @@ Shindo.tests('Brightbox::Compute | user requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_users()").formats(Brightbox::Compute::Formats::Collection::USERS) do
-      data = Brightbox[:compute].list_users()
+    tests("#list_users").formats(Brightbox::Compute::Formats::Collection::USERS) do
+      pending if Fog.mocking?
+      data = Brightbox[:compute].list_users
       @user_id = data.first["id"]
       data
     end
 
     tests("#get_user('#{@user_id}')").formats(Brightbox::Compute::Formats::Full::USER) do
+      pending if Fog.mocking?
       data = Brightbox[:compute].get_user(@user_id)
       @original_name = data["name"]
       data
     end
 
     update_options = { :name => "New name from Fog" }
+
     tests("#update_user('#{@user_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::USER) do
+      pending if Fog.mocking?
       Brightbox[:compute].update_user(@user_id, update_options)
     end
-    Brightbox[:compute].update_user(@user_id, :name => @original_name)
+
+    unless Fog.mocking?
+      Brightbox[:compute].update_user(@user_id, :name => @original_name)
+    end
 
   end
 
   tests('failure') do
 
-    tests("#update_user()").raises(ArgumentError) do
-      Brightbox[:compute].update_user()
+    tests("#update_user").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].update_user
     end
 
   end

data/tests/brightbox/requests/compute/zone_tests.rb

@@ -2,13 +2,15 @@ Shindo.tests('Brightbox::Compute | zone requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#list_zones()").formats(Brightbox::Compute::Formats::Collection::ZONES) do
-      data = Brightbox[:compute].list_zones()
+    tests("#list_zones").formats(Brightbox::Compute::Formats::Collection::ZONES) do
+      pending if Fog.mocking?
+      data = Brightbox[:compute].list_zones
       @zone_id = data.first["id"]
       data
     end
 
     tests("#get_zone('#{@zone_id}')").formats(Brightbox::Compute::Formats::Full::ZONE) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_zone(@zone_id)
     end
 
@@ -17,11 +19,13 @@ Shindo.tests('Brightbox::Compute | zone requests', ['brightbox']) do
   tests('failure') do
 
     tests("#get_zone('zon-00000')").raises(Excon::Errors::NotFound) do
+      pending if Fog.mocking?
       Brightbox[:compute].get_zone('zon-00000')
     end
 
-    tests("#get_zone()").raises(ArgumentError) do
-      Brightbox[:compute].get_zone()
+    tests("#get_zone").raises(ArgumentError) do
+      pending if Fog.mocking?
+      Brightbox[:compute].get_zone
     end
   end
 

data/tests/core/attribute_tests.rb

@@ -0,0 +1,45 @@
+class FogAttributeTestModel < Fog::Model
+  attribute :key, :aliases => 'keys', :squash => "id"
+  attribute :time, :type => :time
+end
+
+Shindo.tests('Fog::Attributes', 'core') do
+
+  @model = FogAttributeTestModel.new
+
+  tests('squash') do
+
+    tests('"keys" => {:id => "value"}').returns('value') do
+      @model.merge_attributes("keys" => {:id => "value"})
+      @model.key
+    end
+
+    tests('"keys" => {"id" => "value"}').returns('value') do
+      @model.merge_attributes("keys" => {'id' => "value"})
+      @model.key
+    end
+
+  end
+
+  tests(':type => :time') do
+
+    @time  = Time.now
+
+    tests(':time => nil').returns(nil) do
+      @model.merge_attributes(:time => nil)
+      @model.time
+    end
+
+    tests(':time => ""').returns('') do
+      @model.merge_attributes(:time => '')
+      @model.time
+    end
+
+    tests(':time => "#{@time.to_s}"').returns(Time.parse(@time.to_s)) do
+      @model.merge_attributes(:time => @time.to_s)
+      @model.time
+    end
+
+  end
+
+end