fog-brightbox 1.10.0 → 1.12.0

data/tests/brightbox/compute/schema.rb

@@ -53,13 +53,13 @@ class Brightbox
           "protocol" => String,
           "incoming" => Integer,
           "outgoing" => Integer
-        }
+        }.freeze
         LB_LISTENER = {
           "in"              => Integer,
           "out"             => Integer,
           "protocol"        => String,
           "timeout"         => Integer
-        }
+        }.freeze
         LB_HEALTHCHECK = {
           "type"            => String,
           "request"         => String,
@@ -68,7 +68,7 @@ class Brightbox
           "timeout"         => Integer,
           "threshold_up"    => Integer,
           "threshold_down"  => Integer
-        }
+        }.freeze
       end
 
       module Nested
@@ -78,7 +78,7 @@ class Brightbox
           "url"             => String,
           "id"              => String,
           "status"          => String
-        }
+        }.freeze
 
         API_CLIENT = {
           "id"              => String,
@@ -87,7 +87,7 @@ class Brightbox
           "name"            => String,
           "description"     => String,
           "revoked_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         CLOUD_IP = {
           "id"              => String,
@@ -97,7 +97,7 @@ class Brightbox
           "public_ip"       => String,
           "status"          => String,
           "reverse_dns"     => String
-        }
+        }.freeze
 
         DATABASE_SERVER = {
           "id"              => String,
@@ -110,7 +110,7 @@ class Brightbox
           "status"          => String,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         DATABASE_SNAPSHOT = {
           "id"              => String,
@@ -124,7 +124,7 @@ class Brightbox
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
+        }.freeze
 
         DATABASE_SERVER_TYPE = {
           "id"              => String,
@@ -134,7 +134,7 @@ class Brightbox
           "description"     => String,
           "ram"             => Integer,
           "disk_size"       => Integer
-        }
+        }.freeze
 
         FIREWALL_POLICY = {
           "id"              => String,
@@ -144,7 +144,7 @@ class Brightbox
           "default"         => Fog::Boolean,
           "created_at"      => String,
           "description"     => Fog::Nullable::String
-        }
+        }.freeze
 
         FIREWALL_RULE = {
           "id"              => String,
@@ -158,7 +158,7 @@ class Brightbox
           "protocol"        => Fog::Nullable::String,
           "icmp_type_name"  => Fog::Nullable::String,
           "description"     => Fog::Nullable::String
-        }
+        }.freeze
 
         IMAGE = {
           "name"            => String,
@@ -174,7 +174,7 @@ class Brightbox
           "official"        => Fog::Boolean,
           "owner"           => String,
           "username"        => Fog::Nullable::String
-        }
+        }.freeze
 
         INTERFACE = {
           "resource_type"   => String,
@@ -183,7 +183,7 @@ class Brightbox
           "ipv4_address"    => String,
           "ipv6_address"    => Fog::Nullable::String,
           "mac_address"     => String
-        }
+        }.freeze
 
         LOAD_BALANCER = {
           "id"              => String,
@@ -193,7 +193,7 @@ class Brightbox
           "status"          => String,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         SERVER = {
           "id"              => String,
@@ -207,7 +207,7 @@ class Brightbox
           "started_at"      => Fog::Nullable::String,
           "deleted_at"      => Fog::Nullable::String,
           "username"        => Fog::Nullable::String
-        }
+        }.freeze
 
         SERVER_GROUP = {
           "id"              => String,
@@ -217,7 +217,7 @@ class Brightbox
           "created_at"      => String,
           "default"         => Fog::Boolean,
           "description"     => Fog::Nullable::String
-        }
+        }.freeze
 
         SERVER_TYPE = {
           "name"            => String,
@@ -229,7 +229,7 @@ class Brightbox
           "id"              => String,
           "ram"             => Integer,
           "status"          => String
-        }
+        }.freeze
 
         USER = {
           "id"              => String,
@@ -237,7 +237,7 @@ class Brightbox
           "url"             => String,
           "name"            => String,
           "email_address"   => String
-        }
+        }.freeze
 
         COLLABORATION = {
           "id"              => String,
@@ -250,7 +250,7 @@ class Brightbox
           "user"            => Fog::Brightbox::Nullable::User,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
+        }.freeze
 
         VOLUME = {
           "id"              => String,
@@ -273,14 +273,14 @@ class Brightbox
           "created_at"      => String,
           "updated_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "handle"          => Fog::Nullable::String
-        }
+        }.freeze
       end
 
       module Collected
@@ -313,7 +313,7 @@ class Brightbox
           "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
           "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
           "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
-        }
+        }.freeze
 
         API_CLIENT = {
           "id"              => String,
@@ -323,14 +323,14 @@ class Brightbox
           "description"     => String,
           "revoked_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
+        }.freeze
 
         APPLICATION = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "name"            => Fog::Nullable::String
-        }
+        }.freeze
 
         CLOUD_IP = {
           "id"              => String,
@@ -346,7 +346,7 @@ class Brightbox
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
           "server"          => Fog::Brightbox::Nullable::Server,
           "server_group" => Fog::Brightbox::Nullable::ServerGroup
-        }
+        }.freeze
 
         DATABASE_SERVER = {
           "id"              => String,
@@ -359,7 +359,7 @@ class Brightbox
           "status"          => String,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         DATABASE_SNAPSHOT = {
           "id"              => String,
@@ -373,7 +373,7 @@ class Brightbox
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
+        }.freeze
 
         DATABASE_SERVER_TYPE = {
           "id"              => String,
@@ -383,7 +383,7 @@ class Brightbox
           "description"     => String,
           "ram"             => Integer,
           "disk_size"       => Integer
-        }
+        }.freeze
 
         FIREWALL_POLICY = {
           "id"              => String,
@@ -395,7 +395,7 @@ class Brightbox
           "created_at"      => String,
           "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
           "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
-        }
+        }.freeze
 
         IMAGE = {
           "name"            => String,
@@ -417,7 +417,7 @@ class Brightbox
           "disk_size"       => Integer,
           "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image
-        }
+        }.freeze
 
         LOAD_BALANCER = {
           "id"              => String,
@@ -431,7 +431,7 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
           "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
-        }
+        }.freeze
 
         SERVER = {
           "id"              => String,
@@ -454,7 +454,7 @@ class Brightbox
           "zone"            => Fog::Brightbox::Nullable::Zone,
           "username"        => Fog::Nullable::String,
           "compatibility_mode" => Fog::Boolean
-        }
+        }.freeze
 
         SERVER_GROUP = {
           "created_at"      => String,
@@ -467,7 +467,7 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
           "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
-        }
+        }.freeze
 
         SERVER_TYPE = {
           "id"              => String,
@@ -479,7 +479,7 @@ class Brightbox
           "cores"           => Integer,
           "ram"             => Integer,
           "disk_size"       => Integer
-        }
+        }.freeze
 
         USER = {
           "id"              => String,
@@ -490,7 +490,7 @@ class Brightbox
           "email_verified"  => Fog::Boolean,
           "accounts"        => [Brightbox::Compute::Formats::Nested::ACCOUNT],
           "default_account" => NilClass
-        }
+        }.freeze
 
         COLLABORATION = {
           "id"              => String,
@@ -503,7 +503,7 @@ class Brightbox
           "user"            => Fog::Brightbox::Nullable::User,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
+        }.freeze
 
         VOLUME = {
           "id"              => String,
@@ -526,14 +526,14 @@ class Brightbox
           "created_at"      => String,
           "updated_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "handle"          => Fog::Nullable::String
-        }
+        }.freeze
       end
 
       module Full
@@ -577,7 +577,7 @@ class Brightbox
           "firewall_policies" => [Brightbox::Compute::Formats::Nested::FIREWALL_POLICY],
           "images"          => [Brightbox::Compute::Formats::Nested::IMAGE],
           "zones"           => [Brightbox::Compute::Formats::Nested::ZONE]
-        }
+        }.freeze
 
         API_CLIENT = {
           "id"              => String,
@@ -588,7 +588,7 @@ class Brightbox
           "revoked_at"      => Fog::Nullable::String,
           "secret"          => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
+        }.freeze
 
         APPLICATION = {
           "id"              => String,
@@ -596,7 +596,7 @@ class Brightbox
           "url"             => String,
           "name"            => Fog::Nullable::String,
           "secret"          => Fog::Nullable::String
-        }
+        }.freeze
 
         CLOUD_IP = {
           "id"              => String,
@@ -612,7 +612,7 @@ class Brightbox
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
           "server"          => Fog::Brightbox::Nullable::Server,
           "server_group"    => Fog::Brightbox::Nullable::ServerGroup
-        }
+        }.freeze
 
         DATABASE_SERVER = {
           "id"              => String,
@@ -627,7 +627,7 @@ class Brightbox
           "status"          => String,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String
-        }
+        }.freeze
 
         DATABASE_SNAPSHOT = {
           "id"              => String,
@@ -641,7 +641,7 @@ class Brightbox
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
-        }
+        }.freeze
 
         DATABASE_SERVER_TYPE = {
           "id"              => String,
@@ -651,7 +651,7 @@ class Brightbox
           "description"     => String,
           "ram"             => Integer,
           "disk_size"       => Integer
-        }
+        }.freeze
 
         FIREWALL_POLICY = {
           "id"              => String,
@@ -663,7 +663,7 @@ class Brightbox
           "created_at"      => String,
           "server_group"    => Fog::Brightbox::Nullable::ServerGroup,
           "rules"           => [Brightbox::Compute::Formats::Nested::FIREWALL_RULE]
-        }
+        }.freeze
 
         FIREWALL_RULE = {
           "id"              => String,
@@ -678,7 +678,7 @@ class Brightbox
           "icmp_type_name"  => Fog::Nullable::String,
           "description"     => Fog::Nullable::String,
           "firewall_policy" => Brightbox::Compute::Formats::Nested::FIREWALL_POLICY
-        }
+        }.freeze
 
         IMAGE = {
           "name"            => String,
@@ -701,7 +701,7 @@ class Brightbox
           "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
           "licence_name"    => Fog::Nullable::String
-        }
+        }.freeze
 
         INTERFACE = {
           "resource_type"   => String,
@@ -711,7 +711,7 @@ class Brightbox
           "ipv6_address"    => Fog::Nullable::String,
           "mac_address"     => String,
           "server"          => Brightbox::Compute::Formats::Nested::SERVER
-        }
+        }.freeze
 
         LOAD_BALANCER = {
           "id"              => String,
@@ -728,7 +728,7 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER],
           "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP]
-        }
+        }.freeze
 
         SERVER = {
           "id"              => String,
@@ -757,7 +757,7 @@ class Brightbox
           "licence_name"    => Fog::Nullable::String,
           "username"        => Fog::Nullable::String,
           "compatibility_mode" => Fog::Boolean
-        }
+        }.freeze
 
         SERVER_GROUP = {
           "created_at"      => String,
@@ -770,7 +770,7 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "servers"         => [Brightbox::Compute::Formats::Nested::SERVER],
           "firewall_policy" => Fog::Brightbox::Nullable::FirewallPolicy
-        }
+        }.freeze
 
         SERVER_TYPE = {
           "id"              => String,
@@ -782,7 +782,7 @@ class Brightbox
           "cores"           => Integer,
           "ram"             => Integer,
           "disk_size"       => Integer
-        }
+        }.freeze
 
         USER = {
           "id"              => String,
@@ -795,7 +795,7 @@ class Brightbox
           "default_account" => Fog::Brightbox::Nullable::Account,
           "ssh_key"         => Fog::Nullable::String,
           "messaging_pref"  => Fog::Boolean
-        }
+        }.freeze
 
         COLLABORATION = {
           "id"              => String,
@@ -808,7 +808,7 @@ class Brightbox
           "user"            => Fog::Brightbox::Nullable::User,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "inviter"         => Brightbox::Compute::Formats::Nested::USER
-        }
+        }.freeze
 
         VOLUME = {
           "id"              => String,
@@ -834,34 +834,34 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "image"           => Fog::Brightbox::Nullable::Image,
           "server"          => Fog::Brightbox::Nullable::Server
-        }
+        }.freeze
 
         ZONE = {
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
           "handle"          => String
-        }
+        }.freeze
       end
 
       module Collection
-        ACCOUNTS = [Brightbox::Compute::Formats::Collected::ACCOUNT]
-        API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT]
-        APPLICATION = [Brightbox::Compute::Formats::Collected::APPLICATION]
-        CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
-        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
-        DATABASE_SERVERS = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER]
-        DATABASE_SERVER_TYPES = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER_TYPE]
-        DATABASE_SNAPSHOTS = [Brightbox::Compute::Formats::Collected::DATABASE_SNAPSHOT]
-        FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
-        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
-        LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
-        SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
-        SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]
-        SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
-        USERS = [Brightbox::Compute::Formats::Collected::USER]
-        VOLUMES = [Brightbox::Compute::Formats::Collected::VOLUME]
-        ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
+        ACCOUNTS = [Brightbox::Compute::Formats::Collected::ACCOUNT].freeze
+        API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT].freeze
+        APPLICATION = [Brightbox::Compute::Formats::Collected::APPLICATION].freeze
+        CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP].freeze
+        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION].freeze
+        DATABASE_SERVERS = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER].freeze
+        DATABASE_SERVER_TYPES = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER_TYPE].freeze
+        DATABASE_SNAPSHOTS = [Brightbox::Compute::Formats::Collected::DATABASE_SNAPSHOT].freeze
+        FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY].freeze
+        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE].freeze
+        LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER].freeze
+        SERVERS = [Brightbox::Compute::Formats::Collected::SERVER].freeze
+        SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP].freeze
+        SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE].freeze
+        USERS = [Brightbox::Compute::Formats::Collected::USER].freeze
+        VOLUMES = [Brightbox::Compute::Formats::Collected::VOLUME].freeze
+        ZONES = [Brightbox::Compute::Formats::Collected::ZONE].freeze
       end
     end
   end

data/tests/brightbox/compute_tests.rb

@@ -9,19 +9,19 @@ end
 Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   tests("service options") do
     {
-      :brightbox_api_url => "https://example.test",
-      :brightbox_auth_url => "https://example.test",
-      :brightbox_client_id => "app-12345",
-      :brightbox_secret => "12345abdef6789",
-      :brightbox_username => "user-12345",
-      :brightbox_password => "password1234",
-      :brightbox_account => "acc-12345",
-      :brightbox_access_token => "12345abdef6789",
-      :brightbox_refresh_token => "12345abdef6789",
-      :brightbox_token_management => false
+      brightbox_api_url: "https://example.test",
+      brightbox_auth_url: "https://example.test",
+      brightbox_client_id: "app-12345",
+      brightbox_secret: "12345abdef6789",
+      brightbox_username: "user-12345",
+      brightbox_password: "password1234",
+      brightbox_account: "acc-12345",
+      brightbox_access_token: "12345abdef6789",
+      brightbox_refresh_token: "12345abdef6789",
+      brightbox_token_management: false
     }.each_pair do |option, sample|
       tests("recognises :#{option}").returns(true) do
-        options = { :provider => "Brightbox" }
+        options = { provider: "Brightbox" }
         options[option] = sample
         begin
           Fog::Compute.new(options)
@@ -34,7 +34,7 @@ Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   end
 
   tests("automatic token management") do
-    service_options = { :provider => "Brightbox" }
+    service_options = { provider: "Brightbox" }
 
     tests("when enabled (default)") do
       service_options[:brightbox_token_management] = true
@@ -67,7 +67,7 @@ Shindo.tests("Fog::Compute.new", ["brightbox"]) do
   end
 
   tests("account scoping") do
-    service = Fog::Compute.new(:provider => "Brightbox")
+    service = Fog::Compute.new(provider: "Brightbox")
     configured_account = Fog.credentials[:brightbox_account]
     tests("when Fog.credentials are #{configured_account}") do
       test("#scoped_account == #{configured_account}") { service.scoped_account == configured_account }
@@ -86,7 +86,7 @@ Shindo.tests("Fog::Compute.new", ["brightbox"]) do
 
     optioned_account = "acc-56789"
     tests("when Compute instance created with :brightbox_account => #{optioned_account}") do
-      service = Fog::Compute.new(:provider => "Brightbox", :brightbox_account => optioned_account)
+      service = Fog::Compute.new(provider: "Brightbox", brightbox_account: optioned_account)
       test("#scoped_account == #{optioned_account}") { service.scoped_account == optioned_account }
     end
 

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

@@ -2,14 +2,4 @@ Shindo.tests("Fog::Compute[:brightbox] | Account model", ["brightbox"]) do
   pending if Fog.mocking?
 
   @account = Fog::Compute[:brightbox].account
-
-  tests("success") do
-    tests("#reset_ftp_password") do
-      pending if Fog.mocking?
-      test("original ftp password is blanked") { @account.library_ftp_password.nil? }
-      @new_password = @account.reset_ftp_password
-      test("new ftp password was not nil") { !@new_password.nil? }
-      test("new ftp password is set") { @account.library_ftp_password == @new_password }
-    end
-  end
 end

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

@@ -3,7 +3,6 @@ Shindo.tests("Fog::Compute[:brightbox] | Server model", ["brightbox"]) do
 
   tests("success") do
     @server = Brightbox::Compute::TestSupport.get_test_server
-    server_id = @server.id
 
     tests("#dns_name") do
       returns("public.#{@server.fqdn}") { @server.dns_name }

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

@@ -2,15 +2,15 @@ Shindo.tests("Fog::Compute[:brightbox] | account requests", ["brightbox"]) do
   tests("success") do
     tests("#list_accounts") do
       pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].list_accounts(:nested => true)
-      data_matches_schema(Brightbox::Compute::Formats::Collection::ACCOUNTS, :allow_extra_keys => true) { result }
+      result = Fog::Compute[:brightbox].list_accounts(nested: true)
+      data_matches_schema(Brightbox::Compute::Formats::Collection::ACCOUNTS, allow_extra_keys: true) { result }
     end
 
     tests("#get_scoped_account") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_scoped_account
       @scoped_account_identifier = result["id"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, allow_extra_keys: true) { result }
       test("ftp password is blanked") { result["library_ftp_password"].nil? }
     end
 
@@ -18,35 +18,21 @@ Shindo.tests("Fog::Compute[:brightbox] | account requests", ["brightbox"]) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_account(@scoped_account_identifier)
       @current_name = result["name"]
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, allow_extra_keys: true) { result }
       test("ftp password is blanked") { result["library_ftp_password"].nil? }
     end
 
-    update_options = { :name => @current_name }
+    update_options = { name: @current_name }
     tests("#update_scoped_account(#{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_scoped_account(update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, allow_extra_keys: true) { result }
     end
 
     tests("#update_account(#{@scoped_account_identifier}, #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_account(@scoped_account_identifier, update_options)
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
-    end
-
-    tests("#reset_ftp_password_scoped_account") do
-      pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].reset_ftp_password_scoped_account
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
-      test("new ftp password is visible") { !result["library_ftp_password"].nil? }
-    end
-
-    tests("#reset_ftp_password_account(#{@scoped_account_identifier})") do
-      pending if Fog.mocking?
-      result = Fog::Compute[:brightbox].reset_ftp_password_account(@scoped_account_identifier)
-      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, :allow_extra_keys => true) { result }
-      test("new ftp password is visible") { !result["library_ftp_password"].nil? }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ACCOUNT, allow_extra_keys: true) { result }
     end
   end