fog-brightbox 1.10.0 → 1.11.0

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

@@ -1,47 +1,47 @@
 Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
   tests("success") do
     create_options = {
-      :name => "Fog@#{Time.now.iso8601}",
-      :description => "Description from Fog test"
+      name: "Fog@#{Time.now.iso8601}",
+      description: "Description from Fog test"
     }
 
     tests("#create_api_client(#{create_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_api_client(create_options)
       @api_client_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, allow_extra_keys: true) { result }
     end
 
     tests("#list_api_clients") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_api_clients
-      data_matches_schema(Brightbox::Compute::Formats::Collection::API_CLIENTS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::API_CLIENTS, allow_extra_keys: true) { result }
     end
 
     tests("#get_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_api_client(@api_client_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, allow_extra_keys: true) { result }
     end
 
-    update_options = { :name => "Fog@#{Time.now.iso8601}" }
+    update_options = { name: "Fog@#{Time.now.iso8601}" }
     tests("#update_api_client('#{@api_client_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, allow_extra_keys: true) { result }
     end
 
     tests("#reset_secret_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_api_client(@api_client_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, allow_extra_keys: true) { result }
       test("new secret is visible") { !result["secret"].nil? }
     end
 
     tests("#delete_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_api_client(@api_client_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::API_CLIENT, allow_extra_keys: true) { result }
     end
   end
 

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

@@ -1,46 +1,46 @@
 Shindo.tests("Fog::Compute[:brightbox] | api client requests", ["brightbox"]) do
   tests("success") do
     create_options = {
-      :name => "Fog@#{Time.now.iso8601}"
+      name: "Fog@#{Time.now.iso8601}"
     }
 
     tests("#create_application(#{create_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_application(create_options)
       @application_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, allow_extra_keys: true) { result }
     end
 
     tests("#list_applications") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_applications
-      data_matches_schema(Brightbox::Compute::Formats::Collection::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::APPLICATION, allow_extra_keys: true) { result }
     end
 
     tests("#get_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_application(@application_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, allow_extra_keys: true) { result }
     end
 
-    update_options = { :name => "Fog@#{Time.now.iso8601}" }
+    update_options = { name: "Fog@#{Time.now.iso8601}" }
     tests("#update_application('#{@application_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_application(@application_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, allow_extra_keys: true) { result }
     end
 
     tests("#reset_secret_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_application(@application_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, allow_extra_keys: true) { result }
       test("new secret is visible") { !result["secret"].nil? }
     end
 
     tests("#delete_application('#{@application_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_application(@application_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::APPLICATION, allow_extra_keys: true) { result }
     end
   end
 

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

@@ -8,29 +8,29 @@ Shindo.tests("Fog::Compute[:brightbox] | cloud ip requests", ["brightbox"]) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_cloud_ip
       @cloud_ip_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
     end
 
     tests("#list_cloud_ips") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_cloud_ips
-      data_matches_schema(Brightbox::Compute::Formats::Collection::CLOUD_IPS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::CLOUD_IPS, allow_extra_keys: true) { result }
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
-      map_options = { :destination => @server.interfaces.first["id"] }
+      map_options = { destination: @server.interfaces.first["id"] }
     end
 
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
@@ -40,29 +40,27 @@ Shindo.tests("Fog::Compute[:brightbox] | cloud ip requests", ["brightbox"]) do
     tests("#unmap_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
-      update_options = { :reverse_dns => "public.#{@server.id}.gb1.brightbox.com" }
+      update_options = { reverse_dns: "public.#{@server.id}.gb1.brightbox.com" }
     end
 
     tests("#update_cloud_ip('#{@cloud_ip_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
-      result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, :reverse_dns => "")
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
+      result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, reverse_dns: "")
     end
 
     tests("#delete_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_cloud_ip(@cloud_ip_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::CLOUD_IP, allow_extra_keys: true) { result }
     end
 
-    unless Fog.mocking?
-      @server.destroy
-    end
+    @server.destroy unless Fog.mocking?
   end
 
   tests("failure") do

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

@@ -5,7 +5,7 @@ Shindo.tests("Fog::Compute[:brightbox] | collaboration requests", ["brightbox"])
 
     tests("#create_collaboration") do
       pending if Fog.mocking?
-      collaboration = Fog::Compute[:brightbox].create_collaboration(:email => @test_collaborator_email, :role => "admin")
+      collaboration = Fog::Compute[:brightbox].create_collaboration(email: @test_collaborator_email, role: "admin")
       @collaboration_id = collaboration["id"]
       formats(Brightbox::Compute::Formats::Full::COLLABORATION, false) { collaboration }
     end

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

@@ -6,38 +6,38 @@ Shindo.tests("Fog::Compute[:brightbox] | database server requests", ["brightbox"
     tests("#create_database_server(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_database_server(create_options)
       @database_server_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, allow_extra_keys: true) { result }
     end
 
     tests("#list_database_servers") do
       result = Fog::Compute[:brightbox].list_database_servers
-      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SERVERS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SERVERS, allow_extra_keys: true) { result }
     end
 
     tests("#get_database_server('#{@database_server_id}')") do
       result = Fog::Compute[:brightbox].get_database_server(@database_server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, allow_extra_keys: true) { result }
     end
 
     update_options = {
-      :name => "New name"
+      name: "New name"
     }
     tests("#update_database_server('#{@database_server_id}', update_options)") do
       result = Fog::Compute[:brightbox].update_database_server(@database_server_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, allow_extra_keys: true) { result }
     end
 
     Fog::Compute[:brightbox].database_servers.get(@database_server_id).wait_for { ready? }
 
     tests("#reset_password_database_server('#{@database_server_id}')") do
       result = Fog::Compute[:brightbox].reset_password_database_server(@database_server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, allow_extra_keys: true) { result }
       test("new password is visible") { !result["admin_password"].nil? }
     end
 
     tests("#delete_database_server('#{@database_server_id}')") do
       result = Fog::Compute[:brightbox].delete_database_server(@database_server_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SERVER, allow_extra_keys: true) { result }
     end
   end
 

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

@@ -11,7 +11,7 @@ Shindo.tests("Fog::Compute[:brightbox] | database snapshot requests", ["brightbo
 
     tests("#list_database_snapshots") do
       result = service.list_database_snapshots
-      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SNAPSHOTS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SNAPSHOTS, allow_extra_keys: true) { result }
       @database_snapshot_id = result.last["id"]
     end
 
@@ -21,20 +21,20 @@ Shindo.tests("Fog::Compute[:brightbox] | database snapshot requests", ["brightbo
 
     tests("#get_database_snapshot('#{@database_snapshot_id}')") do
       result = service.get_database_snapshot(@database_snapshot_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, allow_extra_keys: true) { result }
     end
 
     update_options = {
-      :name => "New name"
+      name: "New name"
     }
     tests("#update_database_snapshot('#{@database_snapshot_id}', update_options)") do
       result = service.update_database_snapshot(@database_snapshot_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, allow_extra_keys: true) { result }
     end
 
     tests("#delete_database_snapshot('#{@database_snapshot_id}')") do
       result = service.delete_database_snapshot(@database_snapshot_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::DATABASE_SNAPSHOT, allow_extra_keys: true) { result }
     end
   end
 

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

@@ -3,7 +3,7 @@ Shindo.tests("Fog::Compute[:brightbox] | database type requests", ["brightbox"])
     tests("#list_database_types") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_database_types
-      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SERVER_TYPES, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::DATABASE_SERVER_TYPES, allow_extra_keys: true) { result }
     end
   end
 

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

@@ -3,37 +3,37 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall policy requests", ["brightbox"
     pending if Fog.mocking?
 
     create_options = {
-      :name => "Fog test policy A"
+      name: "Fog test policy A"
     }
 
     tests("#create_firewall_policy(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_firewall_policy(create_options)
       @firewall_policy_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, allow_extra_keys: true) { result }
     end
 
     tests("#list_firewall_policies()") do
-      data_matches_schema(Brightbox::Compute::Formats::Collection::FIREWALL_POLICIES, :allow_extra_keys => true) do
+      data_matches_schema(Brightbox::Compute::Formats::Collection::FIREWALL_POLICIES, allow_extra_keys: true) do
         Fog::Compute[:brightbox].list_firewall_policies
       end
     end
 
     tests("#get_firewall_policy('#{@firewall_policy_id}')") do
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, allow_extra_keys: true) do
         Fog::Compute[:brightbox].get_firewall_policy(@firewall_policy_id)
       end
     end
 
-    update_options = { :name => "Fog test policy B" }
+    update_options = { name: "Fog test policy B" }
     tests("#update_firewall_policy('#{@firewall_policy_id}', #{update_options.inspect})") do
       result = Fog::Compute[:brightbox].update_firewall_policy(@firewall_policy_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, allow_extra_keys: true) { result }
       returns("Fog test policy B") { result["name"] }
     end
 
     tests("#delete_firewall_policy('#{@firewall_policy_id}')") do
       result = Fog::Compute[:brightbox].delete_firewall_policy(@firewall_policy_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_POLICY, allow_extra_keys: true) { result }
     end
   end
 end

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

@@ -7,36 +7,34 @@ Shindo.tests("Fog::Compute[:brightbox] | firewall rule requests", ["brightbox"])
     end
 
     create_options = {
-      :firewall_policy => policy.id,
-      :destination => "127.0.0.1"
+      firewall_policy: policy.id,
+      destination: "127.0.0.1"
     }
 
     tests("#create_firewall_rule(#{create_options.inspect})") do
       result = Fog::Compute[:brightbox].create_firewall_rule(create_options)
       @firewall_rule_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, allow_extra_keys: true) { result }
     end
 
     tests("#get_firewall_rule('#{@firewall_rule_id}')") do
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, allow_extra_keys: true) do
         Fog::Compute[:brightbox].get_firewall_rule(@firewall_rule_id)
       end
     end
 
-    update_options = { :source => nil, :destination => "127.0.0.1" }
+    update_options = { source: nil, destination: "127.0.0.1" }
     tests("#update_firewall_rule('#{@firewall_rule_id}', #{update_options.inspect})") do
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) do
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, allow_extra_keys: true) do
         Fog::Compute[:brightbox].update_firewall_rule(@firewall_rule_id, update_options)
       end
     end
 
     tests("#delete_firewall_rule('#{@firewall_rule_id}')") do
       result = Fog::Compute[:brightbox].delete_firewall_rule(@firewall_rule_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::FIREWALL_RULE, allow_extra_keys: true) { result }
     end
 
-    unless Fog.mocking?
-      policy.destroy
-    end
+    policy.destroy unless Fog.mocking?
   end
 end

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

@@ -19,7 +19,7 @@ class Brightbox
 
       # Prepare a test server, wait for it to be usable but raise if it fails
       def self.get_test_server
-        test_server_options = { :image_id => image_id }
+        test_server_options = { image_id: image_id }
         server = Fog::Compute[:brightbox].servers.create(test_server_options)
         server.wait_for do
           raise "Test server failed to build" if state == "failed"

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

@@ -17,13 +17,13 @@ Shindo.tests("Fog::Compute[:brightbox] | image requests", ["brightbox"]) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_images
       @image_id = result.first["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Collection::IMAGES, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::IMAGES, allow_extra_keys: true) { result }
     end
 
     tests("#get_image('#{@image_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_image(@image_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::IMAGE, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::IMAGE, allow_extra_keys: true) { result }
     end
 
     ## Until Image creation can be automated, we shouldn't be updating Images randomly

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

@@ -9,7 +9,7 @@ Shindo.tests("Fog::Compute[:brightbox] | interface requests", ["brightbox"]) do
       tests("#get_interface('#{@interface_id}')") do
         pending if Fog.mocking?
         result = @test_service.get_interface(@interface_id)
-        data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, :allow_extra_keys => true) { result }
+        data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, allow_extra_keys: true) { result }
       end
 
       @test_server.destroy

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

@@ -6,17 +6,17 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
     end
 
     create_options = {
-      :nodes => [{
-        :node => node_id
+      nodes: [{
+        node: node_id
       }],
-      :listeners => [{
-        :in       => 80,
-        :out      => 8080,
-        :protocol => "http"
+      listeners: [{
+        in: 80,
+        out: 8080,
+        protocol: "http"
       }],
-      :healthcheck => {
-        :type => "http",
-        :port => 80
+      healthcheck: {
+        type: "http",
+        port: 80
       }
     }
 
@@ -24,7 +24,7 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_load_balancer(create_options)
       @load_balancer_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
@@ -34,34 +34,34 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
     tests("#list_load_balancers()") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_load_balancers
-      data_matches_schema(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, allow_extra_keys: true) { result }
     end
 
     tests("#get_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
-    update_options = { :name => "New name" }
+    update_options = { name: "New name" }
     tests("#update_load_balancer('#{@load_balancer_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_load_balancer(@load_balancer_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
-    add_listeners_options = { :listeners => [{ :out => 28_080, :in => 8080, :protocol => "http" }] }
+    add_listeners_options = { listeners: [{ out: 28_080, in: 8080, protocol: "http" }] }
     tests("#add_listeners_load_balancer('#{@load_balancer_id}', #{add_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_listeners_load_balancer(@load_balancer_id, add_listeners_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
-    remove_listeners_options = { :listeners => [{ :out => 28_080, :in => 8080, :protocol => "http" }] }
+    remove_listeners_options = { listeners: [{ out: 28_080, in: 8080, protocol: "http" }] }
     tests("#remove_listeners_load_balancer('#{@load_balancer_id}', #{remove_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_listeners_load_balancer(@load_balancer_id, remove_listeners_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?
@@ -70,25 +70,25 @@ Shindo.tests("Fog::Compute[:brightbox] | load balancer requests", ["brightbox"])
     end
 
     # Can't remove the last node so we need to add a second...
-    add_nodes_options = { :nodes => [{ :node => second_node_id }] }
+    add_nodes_options = { nodes: [{ node: second_node_id }] }
     tests("#add_nodes_load_balancer('#{@load_balancer_id}', #{add_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_nodes_load_balancer(@load_balancer_id, add_nodes_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
     # ...before we can attempt to remove either
-    remove_nodes_options = { :nodes => [{ :node => node_id }] }
+    remove_nodes_options = { nodes: [{ node: node_id }] }
     tests("#remove_nodes_load_balancer('#{@load_balancer_id}', #{remove_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_nodes_load_balancer(@load_balancer_id, remove_nodes_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
     tests("#delete_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_load_balancer(@load_balancer_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, allow_extra_keys: true) { result }
     end
 
     unless Fog.mocking?

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

@@ -6,9 +6,9 @@ Shindo.tests("Fog::Compute[:brightbox] | server group requests", ["brightbox"])
     end
 
     create_options = {
-      :name => "Fog@#{Time.now.iso8601}",
-      :servers => [{
-        :server => server_id
+      name: "Fog@#{Time.now.iso8601}",
+      servers: [{
+        server: server_id
       }]
     }
 
@@ -16,60 +16,58 @@ Shindo.tests("Fog::Compute[:brightbox] | server group requests", ["brightbox"])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_server_group(create_options)
       @server_group_id = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
     tests("#list_server_groups") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_groups
-      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, allow_extra_keys: true) { result }
       @default_group_id = result.find { |grp| grp["default"] == true }["id"]
     end
 
     tests("#get_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_group(@server_group_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
-    update_options = { :name => "Fog@#{Time.now.iso8601}" }
+    update_options = { name: "Fog@#{Time.now.iso8601}" }
     tests("#update_server_group('#{@server_group_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
-    remove_options = { :servers => [{ :server => server_id }] }
+    remove_options = { servers: [{ server: server_id }] }
     tests("#remove_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
-    add_options = { :servers => [{ :server => server_id }] }
+    add_options = { servers: [{ server: server_id }] }
     tests("#add_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
-    move_options = { :destination => @default_group_id, :servers => [{ :server => server_id }] }
+    move_options = { destination: @default_group_id, servers: [{ server: server_id }] }
     tests("#move_servers_server_group('#{@server_group_id}', #{move_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].move_servers_server_group(@server_group_id, move_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
       test("group is emptied") { result["servers"].empty? }
     end
 
     tests("#delete_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].delete_server_group(@server_group_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, allow_extra_keys: true) { result }
     end
 
-    unless Fog.mocking?
-      @server.destroy
-    end
+    @server.destroy unless Fog.mocking?
   end
 
   tests("failure") do