gitlab-fog-azure-rm 1.8.0 → 1.9.0

data/test/requests/storage/test_get_blob_https_url.rb

@@ -2,15 +2,19 @@ require File.expand_path '../../test_helper', __dir__
 
 # Storage Blob Class
 class TestGetBlobHttpsUrl < Minitest::Test
+  HOUR = 3600
+  DAY = 24 * HOUR
+  WEEK = 7 * DAY
+
   # This class posesses the test cases for the requests of Blob service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
-    @signature_client = @service.instance_variable_get(:@signature_client)
+    @signature_client = @service.send(:signature_client, Minitest::Mock.new)
 
     @url = ApiStub::Requests::Storage::File.blob_https_url
     @token = ApiStub::Requests::Storage::File.blob_url_token
@@ -20,7 +24,7 @@ class TestGetBlobHttpsUrl < Minitest::Test
     mock_generate_uri = Minitest::Mock.new
 
     2.times do
-      mock_generate_uri.expect(:call, @url, ['test_container/test_blob', {}, { encode: true }])
+      mock_generate_uri.expect(:call, URI.parse(@url), ['test_container/test_blob', {}, { encode: true }])
     end
 
     @blob_client.stub :generate_uri, mock_generate_uri do
@@ -37,11 +41,12 @@ class TestGetBlobHttpsUrl < Minitest::Test
     url_params = { content_disposition: 'attachment' }
 
     2.times do
-      mock_generate_uri.expect(:call, @url, ['test_container/test_blob', {}, { encode: true }])
+      mock_generate_uri.expect(:call, URI.parse(@url), ['test_container/test_blob', {}, { encode: true }])
       mock_generate_service_token.expect(:call, @token) do |_relative_path, params|
         params[:service] == 'b' &&
           params[:resource] == 'b' &&
           params[:permissions] == 'r' &&
+          params[:protocol] == 'https' &&
           params[:content_disposition] == url_params[:content_disposition]
       end
     end
@@ -59,7 +64,7 @@ class TestGetBlobHttpsUrl < Minitest::Test
     mock_generate_service_token = Minitest::Mock.new
 
     2.times do
-      mock_generate_uri.expect(:call, @url, ['.test0/..test1/...test2', {}, { encode: true }])
+      mock_generate_uri.expect(:call, URI.parse(@url), ['.test0/..test1/...test2', {}, { encode: true }])
       mock_generate_service_token.expect(:call, @token) do |relative_path, _|
         relative_path == '.test0/..test1/...test2'
       end
@@ -73,20 +78,97 @@ class TestGetBlobHttpsUrl < Minitest::Test
     end
   end
 
+  def test_get_blob_https_url_with_endpoint_success
+    service = Fog::AzureRM::Storage.new(storage_account_credentials_with_endpoint)
+    signature_client = service.send(:signature_client, Minitest::Mock.new)
+
+    url = 'http://localhost:10000/mockaccount/test_container/test_blob'
+    token = ApiStub::Requests::Storage::File.blob_url_token
+
+    signature_client.stub :generate_service_sas_token, token do
+      assert_equal "#{url}?#{token}", service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+      assert_equal "#{url}?#{token}", service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
+    end
+  end
+
   def test_get_blob_https_url_with_domain_success
-    service = Fog::Storage::AzureRM.new(storage_account_credentials_with_domain)
-    blob_client = service.instance_variable_get(:@blob_client)
-    signature_client = service.instance_variable_get(:@signature_client)
+    service = Fog::AzureRM::Storage.new(storage_account_credentials_with_domain)
+    signature_client = service.send(:signature_client, Minitest::Mock.new)
 
     url = 'https://mockaccount.test.example.com/test_container/test_blob'
     token = ApiStub::Requests::Storage::File.blob_url_token
 
-    blob_client.stub :generate_uri, url do
-      signature_client.stub :generate_service_sas_token, token do
-        assert_equal "#{url}?#{token}", service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
-        assert_equal "#{url}?#{token}", service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
+    signature_client.stub :generate_service_sas_token, token do
+      assert_equal "#{url}?#{token}", service.get_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+      assert_equal "#{url}?#{token}", service.get_object_url('test_container', 'test_blob', Time.now.utc + 3600)
+    end
+  end
+
+  def test_get_blob_https_url_with_token_signer_success
+    service = Fog::AzureRM::Storage.new(storage_account_credentials_with_token_signer)
+    blob_client = service.instance_variable_get(:@blob_client)
+
+    ref_time = Time.now
+
+    stubbed_times = []
+    requested_expiries = []
+    expected_user_delegation_key_starts = []
+
+    # initial request
+    stubbed_times << ref_time
+    requested_expiries << stubbed_times.last + 1 * HOUR
+    expected_user_delegation_key_starts << stubbed_times.last
+
+    # second request during expiry window
+    stubbed_times << ref_time + 5.5 * DAY
+    requested_expiries << stubbed_times.last + 1 * DAY
+    # no additonal expected_user_delegation_key_starts
+
+    # request extending past current expiry
+    stubbed_times << ref_time + 6.5 * DAY
+    requested_expiries << stubbed_times.last + 1 * DAY
+    expected_user_delegation_key_starts << stubbed_times.last
+
+    # second request within new expiry
+    stubbed_times << ref_time + 10.5 * DAY
+    requested_expiries << stubbed_times.last + 1 * DAY
+    # no additonal expected_user_delegation_key_starts
+
+    user_delegation_key_starts = []
+    mock_user_delegation_key = lambda do |start, expiry|
+      user_delegation_key_starts << start
+      assert_equal 1 * WEEK, expiry - start
+
+      key = Azure::Storage::Common::Service::UserDelegationKey.new
+      key.signed_start = "start-#{start.to_i}"
+      key.signed_expiry = 'test-expiry'
+      key.value = 'delegation-key'
+      key
+    end
+
+    mock_new_signer = lambda do |token|
+      assert_equal 'delegation-key', token
+      mock_token_signer
+    end
+
+    requested_expiries.each do
+      mock_token_signer.expect(:sign, 'test-signature', [/\Ar\n.+test_blob\n.+\nstart-\d+\ntest-expiry/m])
+    end
+
+    Time.stub :now, -> { stubbed_times.first } do
+      blob_client.stub :get_user_delegation_key, mock_user_delegation_key do
+        Azure::Core::Auth::Signer.stub :new, mock_new_signer do
+          while (requested_expiry = requested_expiries.shift)
+            url = service.get_blob_https_url('test_container', 'test_blob', requested_expiry)
+            assert_match(/^#{Regexp.escape @url}.+&skt=start-#{user_delegation_key_starts.last.to_i}&.+&sig=test-signature/, url)
+
+            stubbed_times.shift
+          end
+        end
       end
     end
+
+    assert_equal expected_user_delegation_key_starts, user_delegation_key_starts
   end
 
   def test_get_blob_https_url_mock

data/test/requests/storage/test_get_blob_properties.rb

@@ -5,11 +5,11 @@ class TestGetBlobProperties < Minitest::Test
   # This class posesses the test cases for the requests of getting storage blob properties.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob = ApiStub::Requests::Storage::File.blob

data/test/requests/storage/test_get_blob_url.rb

@@ -5,18 +5,18 @@ class TestGetBlobUrl < Minitest::Test
   # This class posesses the test cases for the requests of Blob service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
   end
 
   def test_get_blob_url_success
-    service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    service = Fog::AzureRM::Storage.new(storage_account_credentials)
     blob_client = service.instance_variable_get(:@blob_client)
 
     mock_generate_uri = Minitest::Mock.new
     url = ApiStub::Requests::Storage::File.blob_https_url
     2.times do
-      mock_generate_uri.expect(:call, url, ['test_container/test_blob', {}, { encode: true }])
+      mock_generate_uri.expect(:call, URI.parse(url), ['test_container/test_blob', {}, { encode: true }])
     end
 
     blob_client.stub :generate_uri, mock_generate_uri do
@@ -29,44 +29,35 @@ class TestGetBlobUrl < Minitest::Test
 
   def test_get_blob_url_for_china_success
     china_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
-    service = Fog::Storage::AzureRM.new(china_storage_account_credentials)
-    blob_client = service.instance_variable_get(:@blob_client)
+    service = Fog::AzureRM::Storage.new(china_storage_account_credentials)
     url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_CHINA_CLOUD)
 
-    blob_client.stub :generate_uri, url do
-      assert_equal url, service.get_blob_url('test_container', 'test_blob')
+    assert_equal url, service.get_blob_url('test_container', 'test_blob')
 
-      options = { scheme: 'http' }
-      assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
-    end
+    options = { scheme: 'http' }
+    assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
   end
 
   def test_get_blob_url_for_us_success
     us_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
-    service = Fog::Storage::AzureRM.new(us_storage_account_credentials)
-    blob_client = service.instance_variable_get(:@blob_client)
+    service = Fog::AzureRM::Storage.new(us_storage_account_credentials)
     url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_US_GOVERNMENT)
 
-    blob_client.stub :generate_uri, url do
-      assert_equal url, service.get_blob_url('test_container', 'test_blob')
+    assert_equal url, service.get_blob_url('test_container', 'test_blob')
 
-      options = { scheme: 'http' }
-      assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
-    end
+    options = { scheme: 'http' }
+    assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
   end
 
   def test_get_blob_url_for_german_success
     german_storage_account_credentials = storage_account_credentials.merge(environment: Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
-    service = Fog::Storage::AzureRM.new(german_storage_account_credentials)
-    blob_client = service.instance_variable_get(:@blob_client)
+    service = Fog::AzureRM::Storage.new(german_storage_account_credentials)
     url = ApiStub::Requests::Storage::File.blob_https_url(Fog::AzureRM::ENVIRONMENT_AZURE_GERMAN_CLOUD)
 
-    blob_client.stub :generate_uri, url do
-      assert_equal url, service.get_blob_url('test_container', 'test_blob')
+    assert_equal url, service.get_blob_url('test_container', 'test_blob')
 
-      options = { scheme: 'http' }
-      assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
-    end
+    options = { scheme: 'http' }
+    assert_equal url.gsub('https:', 'http:'), service.get_blob_url('test_container', 'test_blob', options)
   end
 
   def test_get_blob_url_mock

data/test/requests/storage/test_get_container_acl.rb

@@ -5,11 +5,11 @@ class TestGetContainerAcl < Minitest::Test
   # This class posesses the test cases for the requests of getting storage container acl.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @raw_container_acl = ApiStub::Requests::Storage::Directory.raw_container_acl

data/test/requests/storage/test_get_container_properties.rb

@@ -5,11 +5,11 @@ class TestGetContainerProperties < Minitest::Test
   # This class posesses the test cases for the requests of getting storage container properties.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @container = ApiStub::Requests::Storage::Directory.container

data/test/requests/storage/test_get_container_url.rb

@@ -5,22 +5,19 @@ class TestGetContainerUrl < Minitest::Test
   # This class posesses the test cases for the requests of getting storage container url.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
-    @blob_client = @service.instance_variable_get(:@blob_client)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
 
     @url = ApiStub::Requests::Storage::Directory.container_https_url
   end
 
   def test_get_container_url_success
-    @blob_client.stub :generate_uri, @url do
-      assert_equal @url, @service.get_container_url('test_container')
+    assert_equal @url, @service.get_container_url('test_container')
 
-      options = { scheme: 'http' }
-      assert_equal @url.gsub('https:', 'http:'), @service.get_container_url('test_container', options)
-    end
+    options = { scheme: 'http' }
+    assert_equal @url.gsub('https:', 'http:'), @service.get_container_url('test_container', options)
   end
 
   def test_get_container_url_mock

data/test/requests/storage/test_get_object.rb

@@ -5,11 +5,11 @@ class TestGetObject < Minitest::Test
   # This class posesses the test cases for the requests of getting storage blob.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @raw_cloud_blob = storage_blob

data/test/requests/storage/test_list_blobs.rb

@@ -5,11 +5,11 @@ class TestListBlobs < Minitest::Test
   # This class posesses the test cases for the requests of listing blobs in storage containers.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_list = ApiStub::Requests::Storage::File.blob_list

data/test/requests/storage/test_list_containers.rb

@@ -5,11 +5,11 @@ class TestListContainers < Minitest::Test
   # This class posesses the test cases for the requests of listing storage containers.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @containers = ApiStub::Requests::Storage::Directory.container_list

data/test/requests/storage/test_put_blob_block.rb

@@ -5,11 +5,11 @@ class TestPutBlobBlock < Minitest::Test
   # This class posesses the test cases for the requests of putting blob block.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_put_blob_http_url.rb

@@ -0,0 +1,33 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Storage Blob Class
+class TestPutBlobHttpUrl < Minitest::Test
+  # This class posesses the test cases for the requests of Blob service.
+  def setup
+    Fog.mock!
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    Fog.unmock!
+
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    @signature_client = @service.send(:signature_client, Minitest::Mock.new)
+
+    @url = ApiStub::Requests::Storage::File.blob_https_url.gsub('https:', 'http:')
+    @token = ApiStub::Requests::Storage::File.blob_url_token
+  end
+
+  def test_put_blob_http_urls_success
+    @signature_client.stub :generate_service_sas_token, @token do
+      assert_equal "#{@url}?#{@token}", @service.put_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
+    end
+  end
+
+  def test_put_url_https_in_container_and_blob_names
+    uri = URI.parse(@service.put_blob_http_url('https://container', 'https://blob', Time.now.utc + 3600))
+    assert_equal 'http', uri.scheme
+    assert_equal '/https://container/https://blob', CGI.unescape(uri.path)
+  end
+
+  def test_put_blob_http_url_mock
+    assert_equal "#{@url}?#{@token}", @mock_service.put_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
+  end
+end

data/test/requests/storage/test_put_blob_https_url.rb

@@ -1,27 +1,24 @@
 require File.expand_path '../../test_helper', __dir__
 
 # Storage Blob Class
-class TestPutBlobHttpUrl < Minitest::Test
+class TestPutBlobHttpsUrl < Minitest::Test
   # This class posesses the test cases for the requests of Blob service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
-    @blob_client = @service.instance_variable_get(:@blob_client)
-    @signature_client = @service.instance_variable_get(:@signature_client)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
+    @signature_client = @service.send(:signature_client, Minitest::Mock.new)
 
     @url = ApiStub::Requests::Storage::File.blob_https_url
     @token = ApiStub::Requests::Storage::File.blob_url_token
   end
 
-  def test_put_blob_http_urls_success
-    @blob_client.stub :generate_uri, @url do
-      @signature_client.stub :generate_service_sas_token, @token do
-        assert_equal "#{@url}?#{@token}", @service.put_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
-        assert_equal "#{@url}?#{@token}", @service.put_object_url('test_container', 'test_blob', Time.now.utc + 3600, {})
-      end
+  def test_put_blob_https_urls_success
+    @signature_client.stub :generate_service_sas_token, @token do
+      assert_equal "#{@url}?#{@token}", @service.put_blob_https_url('test_container', 'test_blob', Time.now.utc + 3600)
+      assert_equal "#{@url}?#{@token}", @service.put_object_url('test_container', 'test_blob', Time.now.utc + 3600, {})
     end
   end
 

data/test/requests/storage/test_put_blob_metadata.rb

@@ -5,11 +5,11 @@ class TestPutBlobMetadata < Minitest::Test
   # This class posesses the test cases for the requests of setting blob metadata.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @metadata = ApiStub::Requests::Storage::File.blob_metadata

data/test/requests/storage/test_put_blob_pages.rb

@@ -5,11 +5,11 @@ class TestPutBlobPages < Minitest::Test
   # This class posesses the test cases for the requests of putting blob page.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_put_blob_properties.rb

@@ -5,11 +5,11 @@ class TestPutBlobProperties < Minitest::Test
   # This class posesses the test cases for the requests of setting blob properties.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @properties = {

data/test/requests/storage/test_put_container_acl.rb

@@ -5,11 +5,11 @@ class TestPutContainerACL < Minitest::Test
   # This class posesses the test cases for the requests of setting storage container acl.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_put_container_metadata.rb

@@ -5,11 +5,11 @@ class TestPutContainerMetadata < Minitest::Test
   # This class posesses the test cases for the requests of container service.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @metadata = ApiStub::Requests::Storage::Directory.container_metadata

data/test/requests/storage/test_release_blob_lease.rb

@@ -5,11 +5,11 @@ class TestReleaseBlobLease < Minitest::Test
   # This class posesses the test cases for the requests of releasing blob lease.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_release_container_lease.rb

@@ -5,11 +5,11 @@ class TestReleaseContainerLease < Minitest::Test
   # This class posesses the test cases for the requests of releasing container lease.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 

data/test/requests/storage/test_save_page_blob.rb

@@ -5,11 +5,11 @@ class TestSavePageBlob < Minitest::Test
   # This class posesses the test cases for the requests of saving storage page blob.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
   end
 
   def test_save_page_blob_success

data/test/requests/storage/test_wait_blob_copy_operation_to_finish.rb

@@ -5,12 +5,12 @@ class TestWaitBlobCopyOperationToFinish < Minitest::Test
   # This class posesses the test cases for the requests of waiting storage blob copy operation to finish.
   def setup
     Fog.mock!
-    @mock_service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @mock_service = Fog::AzureRM::Storage.new(storage_account_credentials)
     Fog.unmock!
     @mocked_response = mocked_storage_http_error
     @blob = storage_blob
 
-    @service = Fog::Storage::AzureRM.new(storage_account_credentials)
+    @service = Fog::AzureRM::Storage.new(storage_account_credentials)
     @blob_client = @service.instance_variable_get(:@blob_client)
   end
 
@@ -49,7 +49,9 @@ class TestWaitBlobCopyOperationToFinish < Minitest::Test
     end
 
     @service.stub :get_blob_properties, multiple_values do
-      assert @service.wait_blob_copy_operation_to_finish('test_container', 'test_blob', copy_id, copy_status)
+      @service.stub :sleep, ->(delay) {} do
+        assert @service.wait_blob_copy_operation_to_finish('test_container', 'test_blob', copy_id, copy_status)
+      end
     end
   end
 
@@ -104,10 +106,17 @@ class TestWaitBlobCopyOperationToFinish < Minitest::Test
       @blob
     end
 
+    stubbed_times = [
+      Time.now,
+      Time.now + 5
+    ]
+
     @service.stub :get_blob_properties, multiple_values do
-      @service.stub :delete_blob, true do
-        assert_raises(Timeout::Error) do
-          @service.wait_blob_copy_operation_to_finish('test_container', 'test_blob', copy_id, copy_status, 2)
+      Time.stub :new, -> { stubbed_times.shift } do
+        @service.stub :delete_blob, true do
+          assert_raises(Timeout::Error) do
+            @service.wait_blob_copy_operation_to_finish('test_container', 'test_blob', copy_id, copy_status, 2)
+          end
         end
       end
     end