Merge pull request #314 from fog/fix-unit-tests

Fixed unit tests
fog · Sep 22, 2017 · 72c7dd1 · 72c7dd1
2 parents 8667de4 + 9a503f6
commit 72c7dd1
Show file tree

Hide file tree

Showing 41 changed files with 72 additions and 52 deletions.
diff --git a/fog-azure-rm.gemspec b/fog-azure-rm.gemspec
@@ -5,7 +5,7 @@ require 'fog/azurerm/version'
 Gem::Specification.new do |spec|
   spec.name          = 'fog-azure-rm'
   spec.version       = Fog::AzureRM::VERSION
-  spec.authors       = ['Shaffan Chaudhry', 'Samawia Moin', 'Adnan Khalil', 'Zeeshan Arshad', 'Haider Ali', 'Waqar Haider', 'Bilal Naeem', 'Muhammad Asad', 'Azeem Sajid', 'Maham Nazir']
+  spec.authors       = ['Shaffan Chaudhry', 'Samawia Moin', 'Adnan Khalil', 'Zeeshan Arshad', 'Haider Ali', 'Waqar Haider', 'Bilal Naeem', 'Muhammad Asad', 'Azeem Sajid', 'Maham Nazir', 'Abbas Sheikh']
   spec.summary       = "Module for the 'fog' gem to support Azure Resource Manager cloud services."
   spec.description   = "This library can be used as a module for 'fog' or as standalone provider
                         to use the Azure Resource Manager cloud services in applications.."
@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
   spec.add_dependency 'fog-core', '~> 1.43.0'
   spec.add_dependency 'fog-json', '~> 1.0'
-  spec.add_dependency 'rest-client', '~> 2.0.0'
   spec.add_dependency 'azure_mgmt_compute', '~> 0.9.0'
   spec.add_dependency 'azure_mgmt_resources', '~> 0.9.0'
   spec.add_dependency 'azure_mgmt_storage', '~> 0.9.0'
@@ -33,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'azure_mgmt_traffic_manager', '~> 0.9.0'
   spec.add_dependency 'azure_mgmt_sql', '~> 0.9.0'
   spec.add_dependency 'azure_mgmt_key_vault', '~> 0.9.0'
-  spec.add_dependency 'azure-storage', '>= 0.11.5.preview', '< 1.0'
+  spec.add_dependency 'azure-storage', '= 0.11.5.preview'
   spec.add_dependency 'vhd', '0.0.4'
 end
diff --git a/lib/fog/azurerm/models/traffic_manager/traffic_manager_profile.rb b/lib/fog/azurerm/models/traffic_manager/traffic_manager_profile.rb
@@ -55,7 +55,7 @@ def destroy
 
         def update(profile_params)
           validate_input(profile_params)
-          profile_params[:endpoints] = endpoints.map { |endpoint| get_hash_from_object(endpoint)['attributes'] }
+          profile_params[:endpoints] = endpoints.map { |endpoint| get_hash_from_object(endpoint)['attributes'] } unless endpoints.nil?
           merge_attributes(profile_params)
           profile = service.create_or_update_traffic_manager_profile(traffic_manager_profile_hash)
           merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerProfile.parse(profile))

diff --git a/lib/fog/azurerm/utilities/general.rb b/lib/fog/azurerm/utilities/general.rb
@@ -55,7 +55,7 @@ def raise_azure_exception(exception, msg)
               end
     exception_message = "Exception in #{msg} #{message} Type: #{exception.class}\n#{exception.backtrace.join("\n")}"
   else
-    "#{exception.inspect}\n#{exception.backtrace.join("\n")}"
+    exception_message = "#{exception.inspect}\n#{exception.backtrace.join("\n")}"
   end
 
   Fog::Logger.debug exception.backtrace

diff --git a/test/integration/application_gateway.rb b/test/integration/application_gateway.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/availability_set.rb b/test/integration/availability_set.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/blob.rb b/test/integration/blob.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/container.rb b/test/integration/container.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/data_disk.rb b/test/integration/data_disk.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/deployment.rb b/test/integration/deployment.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/express_route_circuit.rb b/test/integration/express_route_circuit.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/external_load_balancer.rb b/test/integration/external_load_balancer.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/internal_load_balancer.rb b/test/integration/internal_load_balancer.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/key_vault.rb b/test/integration/key_vault.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/local_network_gateway.rb b/test/integration/local_network_gateway.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/managed_disk.rb b/test/integration/managed_disk.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/network_interface.rb b/test/integration/network_interface.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/network_security_group.rb b/test/integration/network_security_group.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/network_security_rule.rb b/test/integration/network_security_rule.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/public_ip.rb b/test/integration/public_ip.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/record_set.rb b/test/integration/record_set.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/resource_group.rb b/test/integration/resource_group.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/resource_tag.rb b/test/integration/resource_tag.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/server.rb b/test/integration/server.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/server_custom_image.rb b/test/integration/server_custom_image.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/sql_server.rb b/test/integration/sql_server.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/storage_account.rb b/test/integration/storage_account.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/subnet.rb b/test/integration/subnet.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/traffic_manager.rb b/test/integration/traffic_manager.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resources = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/virtual_machine_extension.rb b/test/integration/virtual_machine_extension.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/virtual_network.rb b/test/integration/virtual_network.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/virtual_network_gateway.rb b/test/integration/virtual_network_gateway.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/virtual_network_gateway_connection.rb b/test/integration/virtual_network_gateway_connection.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/virtual_network_gateway_connection_to_express_route.rb b/test/integration/virtual_network_gateway_connection_to_express_route.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 resource = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/integration/zone.rb b/test/integration/zone.rb
@@ -6,7 +6,7 @@
 ######################                              Keep it Uncommented!                          ######################
 ########################################################################################################################
 
-azure_credentials = YAML.load_file('credentials/azure.yml')
+azure_credentials = YAML.load_file(File.expand_path('credentials/azure.yml', __dir__))
 
 rs = Fog::Resources::AzureRM.new(
   tenant_id: azure_credentials['tenant_id'],

diff --git a/test/models/key_vault/test_vault.rb b/test/models/key_vault/test_vault.rb
@@ -4,7 +4,7 @@
 class TestVault < Minitest::Test
   def setup
     @service = Fog::KeyVault::AzureRM.new(credentials)
-    @vault = Fog::KeyVault::AzureRM::Vault.new
+    @vault = key_vault(@service)
   end
 
   def test_model_attributes