adapt tests

Author: kathap

spec/unit/lib/cloud_controller/blobstore/storage_cli/azure_storage_cli_client_spec.rb

@@ -1,13 +1,46 @@
 require 'spec_helper'
+require 'tempfile'
+require 'json'
 require_relative '../client_shared'
 require 'cloud_controller/blobstore/storage_cli/azure_storage_cli_client'
 require 'cloud_controller/blobstore/storage_cli/storage_cli_blob'
 
 module CloudController
   module Blobstore
     RSpec.describe AzureStorageCliClient do
-      subject(:client) { AzureStorageCliClient.new(connection_config: connection_config, directory_key: directory_key, root_dir: 'bommel') }
+      let!(:tmp_cfg) do
+        f = Tempfile.new(['storage_cli_config', '.json'])
+        f.write({ provider: 'AzureRM',
+                  account_name: 'some-account-name',
+                  account_key:  'some-access-key',
+                  container_name: directory_key,
+                  environment: 'AzureCloud' }.to_json)
+        f.flush
+        f
+      end
+
+      before do
+        cc_cfg = instance_double('VCAP::CloudController::Config')
+        allow(VCAP::CloudController::Config).to receive(:config).and_return(cc_cfg)
+
+        allow(cc_cfg).to receive(:get) do |key, *_|
+          case key
+          when :storage_cli_config_file_droplets,
+            :storage_cli_config_file_buildpacks,
+            :storage_cli_config_file_packages,
+            :storage_cli_config_file_resource_pool
+            tmp_cfg.path
+          else
+            nil
+          end
+        end
+      end
+
+      after { tmp_cfg.close! }
+
+      subject(:client) { AzureStorageCliClient.new(connection_config: connection_config, directory_key: directory_key, resource_type: resource_type, root_dir: 'bommel') }
       let(:directory_key) { 'my-bucket' }
+      let(:resource_type) { 'resource_pool' }
       let(:connection_config) do
         {
           azure_storage_access_key: 'some-access-key',
@@ -59,7 +92,7 @@ module Blobstore
           expect(client.instance_variable_get(:@config_file)).to be_a(String)
           expect(File.exist?(client.instance_variable_get(:@config_file))).to be true
           expect(File.read(client.instance_variable_get(:@config_file))).to eq(
-            '{"account_name":"some-account-name","account_key":"some-access-key","container_name":"my-bucket","environment":"AzureCloud"}'
+            '{"provider":"AzureRM","account_name":"some-account-name","account_key":"some-access-key","container_name":"my-bucket","environment":"AzureCloud"}'
           )
         end
       end

spec/unit/lib/cloud_controller/dependency_locator_spec.rb

@@ -77,7 +77,8 @@
     it 'creates blob store' do
       expect(CloudController::Blobstore::ClientProvider).to receive(:provide).with(
         options: config.get(:resource_pool),
-        directory_key: 'key'
+        directory_key: 'key',
+        resource_type: :resource_pool
       )
       locator.legacy_global_app_bits_cache
     end
@@ -97,7 +98,8 @@
       expect(CloudController::Blobstore::ClientProvider).to receive(:provide).with(
         options: config.get(:resource_pool),
         directory_key: 'key',
-        root_dir: 'app_bits_cache'
+        root_dir: 'app_bits_cache',
+        resource_type: :resource_pool
       )
       locator.global_app_bits_cache
     end