azure 0.6.4 → 0.7.0.pre

data/test/unit/cloud_service_management/cloud_service_management_service_test.rb

@@ -19,7 +19,7 @@ describe Azure::CloudServiceManagementService do
   subject { Azure::CloudServiceManagementService.new }
   let(:request_path) { '/services/hostedservices' }
   let(:cloud_services_xml) { Fixtures['list_cloud_services'] }
-  let(:method) { :get }
+  let(:verb) { :get }
   let(:mock_request) { mock }
   let(:response) do
     response = mock
@@ -28,13 +28,13 @@ describe Azure::CloudServiceManagementService do
   end
   let(:response_body) { Nokogiri::XML response.body }
 
-  before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-  end
+  before{
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
+  }
 
-  describe '#list_cloud_services' do
+  describe "#list_cloud_services" do
     before do
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
     end
 
@@ -55,9 +55,9 @@ describe Azure::CloudServiceManagementService do
     end
   end
 
-  describe '#get_cloud_service' do
+  describe "#get_cloud_service" do
     before do
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
     end
 
@@ -65,28 +65,28 @@ describe Azure::CloudServiceManagementService do
       subject.get_cloud_service 'cloud-service-1'
     end
 
-    it 'returns true if found cloud service with given name' do
+    it 'return cloud service instance if found cloud service with given name' do
       result = subject.get_cloud_service 'cloud-service-1'
-      result.must_equal true
+      result.must_be_kind_of Azure::CloudServiceManagement::CloudService
     end
 
-    it "returns false if cloud service with given name doesn't exists" do
+    it "returns nil if cloud service with given name doesn't exists" do
       result = subject.get_cloud_service 'cloud-service-3'
-      result.must_equal false
+      result.must_equal nil
     end
   end
 
-  describe '#create_cloud_service' do
+  describe "#create_cloud_service" do
 
-    it 'Create cloud service return message if cloud service exists of given name.' do
-      ManagementHttpRequest.any_instance.expects(:call).returns response_body
+    it "Create cloud service return message if cloud service exists of given name." do
+      Azure::BaseManagement::ManagementHttpRequest.any_instance.expects(:call).returns response_body
       msg = subject.create_cloud_service 'cloud-service-1'
       assert_match(/^Cloud service cloud-service-1 already exists*/, msg)
     end
 
     it "Create cloud service if cloud service doesn't exists of given name." do
       Azure::CloudServiceManagementService.any_instance.stubs(:get_cloud_service).with('cloud-service-3').returns(false)
-      ManagementHttpRequest.any_instance.expects(:call).returns nil
+      Azure::BaseManagement::ManagementHttpRequest.any_instance.expects(:call).returns nil
       subject.create_cloud_service 'cloud-service-3'
     end
 

data/test/unit/core/auth/shared_key_lite_test.rb

@@ -18,7 +18,7 @@ require "azure/core/auth/shared_key_lite"
 describe Azure::Core::Auth::SharedKeyLite do
   subject { Azure::Core::Auth::SharedKeyLite.new "account-name", "YWNjZXNzLWtleQ==" }
   
-  let(:method) { "POST" }
+  let(:verb) { "POST" }
   let(:uri) { URI.parse "http://dummy.uri/resource" }
   let(:headers) do
     {
@@ -35,16 +35,16 @@ describe Azure::Core::Auth::SharedKeyLite do
   
   describe "sign" do
     it "creates a signature from the provided HTTP method, uri, and reduced set of standard headers" do
-      subject.sign(method, uri, headers).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
+      subject.sign(verb, uri, headers).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
     end
 
     it "ignores standard headers other than Content-MD5, Content-Type, and Date" do
-      subject.sign(method, uri, headers.merge({"Content-Encoding"=> "foo"})).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
+      subject.sign(verb, uri, headers.merge({"Content-Encoding"=> "foo"})).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
     end
 
     it "throws IndexError when there is no Date header" do
       assert_raises IndexError do
-        subject.sign(method, uri, headers_without_date)
+        subject.sign(verb, uri, headers_without_date)
       end
     end
   end

data/test/unit/core/auth/shared_key_test.rb

@@ -18,7 +18,7 @@ require "azure/core/auth/shared_key"
 describe Azure::Core::Auth::SharedKey do
   subject { Azure::Core::Auth::SharedKey.new "account-name", "YWNjZXNzLWtleQ==" }
   
-  let(:method) { "POST" }
+  let(:verb) { "POST" }
   let(:uri) { URI.parse "http://dummy.uri/resource" }
   let(:headers) do
     {
@@ -40,7 +40,7 @@ describe Azure::Core::Auth::SharedKey do
 
   describe "sign" do
     it "creates a signature from the provided HTTP method, uri, and a specific set of standard headers" do
-      subject.sign(method, uri, headers).must_equal "account-name:vcdxlDVoE1QvJerkg0ci3Wlnj2Qq8yzlsrkRf5dEU/I="
+      subject.sign(verb, uri, headers).must_equal "account-name:vcdxlDVoE1QvJerkg0ci3Wlnj2Qq8yzlsrkRf5dEU/I="
     end
   end
   

data/test/unit/core/http/http_error_test.rb

@@ -17,7 +17,7 @@ require "azure/core/http/http_error"
 
 describe Azure::Core::Http::HTTPError do
   let :http_response do
-    double(:body=> Fixtures[:http_error], :status_code=> 409, :uri=>'http://dummy.uri')
+    stub(:body => Fixtures[:http_error], :status_code => 409, :uri => 'http://dummy.uri')
   end
 
   subject do
@@ -48,10 +48,15 @@ describe Azure::Core::Http::HTTPError do
     subject.message.must_equal "TableAlreadyExists (409): The table specified already exists."
   end
 
-  it "sets the type to unknown if the response body is not an XML" do
-    http_response.body = "\r\nInvalid request\r\n"
+  describe 'with invalid http_response body' do
 
-    subject.type.must_equal "Unknown"
-    subject.description.must_equal "Invalid request"
+    let :http_response do
+      stub(:body => "\r\nInvalid request\r\n", :status_code => 409, :uri => 'http://dummy.uri')
+    end
+
+    it "sets the type to unknown if the response body is not an XML" do
+      subject.type.must_equal "Unknown"
+      subject.description.must_equal "Invalid request"
+    end
   end
 end

data/test/unit/core/http/http_request_test.rb

@@ -12,54 +12,101 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "test_helper"
-require "azure/core/http/http_request"
+require 'test_helper'
+require 'azure/core/http/http_request'
 
 describe Azure::Core::Http::HttpRequest do
-  describe " default_headers " do
+  describe ' default_headers ' do
     subject do 
-      Azure::Core::Http::HttpRequest.new(:get, URI("/"), nil, "Thu, 04 Oct 2012 06:38:27 GMT")
+      Azure::Core::Http::HttpRequest.new(:get, URI('/'), nil, 'Thu, 04 Oct 2012 06:38:27 GMT')
     end
 
-    it "sets the x-ms-date header to the current_time" do
-      subject.headers["x-ms-date"] = "Thu, 04 Oct 2012 06:38:27 GMT"
+    it 'sets the x-ms-date header to the current_time' do
+      subject.headers['x-ms-date'] = 'Thu, 04 Oct 2012 06:38:27 GMT'
     end
 
-    it "sets the x-ms-version header to the current API version" do
-      subject.headers["x-ms-version"] = "2011-08-18"
+    it 'sets the x-ms-version header to the current API version' do
+      subject.headers['x-ms-version'] = '2011-08-18'
     end
 
-    it "sets the DataServiceVersion header to the current API version" do
-      subject.headers["DataServiceVersion"] = "1.0;NetFx"
+    it 'sets the DataServiceVersion header to the current API version' do
+      subject.headers['DataServiceVersion'] = '1.0;NetFx'
     end
 
-    it "sets the MaxDataServiceVersion header to the current max` API version" do
-      subject.headers["MaxDataServiceVersion"] = "2.0;NetFx"
+    it 'sets the MaxDataServiceVersion header to the current max` API version' do
+      subject.headers['MaxDataServiceVersion'] = '2.0;NetFx'
     end
 
-    describe " when passed a body " do
+    let :http do
+      mock = Minitest::Mock.new
+      mock.expect(:use_ssl=, true, [true])
+      mock.expect(:verify_mode=, OpenSSL::SSL::VERIFY_PEER, [1])
+      mock.expect(:request, Net::HTTPResponse.new(1.1, 200, '<body/>'), [Net::HTTP::Get])
+      mock
+    end
+
+    describe 'when not using a ca_file' do
+      subject do
+        Azure::Core::Http::HttpRequest.new(:get, URI('https://manage.windowsazure.com'), nil, 'Thu, 04 Oct 2012 06:38:27 GMT')
+      end
+
+      it 'should set the ca_file on the http request' do
+        Net::HTTP.stub(:new, http) do
+          subject.call
+        end
+        http.verify
+      end
+    end
+
+    describe 'when using a ca_file' do
+      before do
+        Azure.config.ca_file = './blah.pem'
+      end
+
+      after do
+        Azure.config.ca_file = nil
+      end
+
+      subject do
+        Azure::Core::Http::HttpRequest.new(:get, URI('https://manage.windowsazure.com'), nil, 'Thu, 04 Oct 2012 06:38:27 GMT')
+      end
+
+      let :ca_http do
+        http.expect(:ca_file=, Azure.config.ca_file, [String])
+      end
+
+      it 'should set the ca_file on the http request' do
+        Net::HTTP.stub(:new, ca_http) do
+          subject.call
+        end
+        ca_http.verify
+      end
+
+    end
+
+    describe ' when passed a body ' do
       subject do 
-        Azure::Core::Http::HttpRequest.new(:get, URI("/"), "<body/>")
+        Azure::Core::Http::HttpRequest.new(:get, URI('/'), '<body/>')
       end
 
-      it "sets the default Content-Type header" do
-        subject.headers["Content-Type"].must_equal "application/atom+xml; charset=utf-8"
+      it 'sets the default Content-Type header' do
+        subject.headers['Content-Type'].must_equal 'application/atom+xml; charset=utf-8'
       end
 
-      it "sets the Content-Length header" do
-        subject.headers["Content-Length"].must_equal "7"
+      it 'sets the Content-Length header' do
+        subject.headers['Content-Length'].must_equal '7'
       end
 
-      it "sets the Content-MD5 header to a Base64 encoded representation of the MD5 hash of the body" do
-        subject.headers["Content-MD5"].must_equal "PNeJy7qyzV4XUoBBHkVu0g=="
+      it 'sets the Content-MD5 header to a Base64 encoded representation of the MD5 hash of the body' do
+        subject.headers['Content-MD5'].must_equal 'PNeJy7qyzV4XUoBBHkVu0g=='
       end
     end
 
-    describe " when the body is nil " do
-      it "leaves the Content-Type, Content-Length, and Content-MD5 headers blank" do
-        subject.headers["Content-Type"].must_equal ""
-        subject.headers["Content-Length"].must_equal "0"
-        subject.headers["Content-MD5"].must_be_nil
+    describe ' when the body is nil ' do
+      it 'leaves the Content-Type, Content-Length, and Content-MD5 headers blank' do
+        subject.headers['Content-Type'].must_equal ''
+        subject.headers['Content-Length'].must_equal '0'
+        subject.headers['Content-MD5'].must_be_nil
       end
     end
   end

data/test/unit/database/serialization_test.rb

@@ -38,18 +38,18 @@ describe Azure::SqlDatabaseManagement::Serialization do
   describe '#database_to_xml' do
     let(:login) { 'administrator' }
     let(:password) { 'Password@123' }
-    let(:location) { 'West US' }
+    let(:geo_location) { 'West US' }
 
     it 'accepts an name and options hash' do
-      subject.database_to_xml(login, password, location)
+      subject.database_to_xml(login, password, geo_location)
     end
 
     it 'serializes the argument to xml' do
-      results = subject.database_to_xml login, password, location
+      results = subject.database_to_xml login, password, geo_location
       doc = Nokogiri::XML results
       doc.css('AdministratorLogin').text.must_equal login
       doc.css('AdministratorLoginPassword').text.must_equal password
-      doc.css('Location').text.must_equal location
+      doc.css('Location').text.must_equal geo_location
       results.must_be_kind_of String
     end
 
@@ -58,8 +58,8 @@ describe Azure::SqlDatabaseManagement::Serialization do
   describe '#firewall_rule_to_xml' do
     let(:options) do
       {
-        start_ip_address: '10.0.0.1',
-        end_ip_address: '10.0.0.255'
+          start_ip_address: '10.0.0.1',
+          end_ip_address: '10.0.0.255'
       }
     end
 
@@ -86,7 +86,7 @@ describe Azure::SqlDatabaseManagement::Serialization do
 
     it 'returns an Array of SqlDatabaseServer instances with firewall' do
       results = subject.database_firewall_from_xml(
-        Nokogiri::XML(sql_server_firewall_xml)
+          Nokogiri::XML(sql_server_firewall_xml)
       )
       results.must_be_kind_of Array
       results[0].must_be_kind_of Hash

data/test/unit/database/sql_database_server_service_test.rb

@@ -24,7 +24,7 @@ describe 'Azure::SqlDatabaseManagementService' do
 
   describe 'SQL Server authentication Endpoint' do
     before do
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
       mock_request.stubs(:headers).returns(response_headers)
       mock_request.expects(:call).returns(Nokogiri::XML response_xml).at_least(0)
       Azure.config.sql_database_authentication_mode = :sql_server
@@ -32,14 +32,14 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#list_servers' do
       let(:response_xml) { Fixtures['list_sql_database'] }
-      let(:method) { :get }
+      let(:verb) { :get }
       let(:request_path) { '/servers' }
 
       before do
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          nil
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(
+            verb,
+            request_path,
+            nil
         ).returns(mock_request)
       end
 
@@ -64,7 +64,7 @@ describe 'Azure::SqlDatabaseManagementService' do
     describe '#delete_server' do
       before do
         Azure::SqlDatabaseManagementService.any_instance.stubs(
-          :list_servers
+            :list_servers
         ).returns([])
       end
 
@@ -82,7 +82,7 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#list_sql_server_firewall_rules' do
       let(:response_xml) { Fixtures['list_sql_server_firewall'] }
-      let(:method) { :get }
+      let(:verb) { :get }
       let(:sql_server_name) { 'server1' }
       let(:request_path) { "/servers/#{sql_server_name}/firewallrules" }
 
@@ -91,13 +91,13 @@ describe 'Azure::SqlDatabaseManagementService' do
           server.name = sql_server_name
         end
         Azure::SqlDatabaseManagementService.any_instance.stubs(
-          :list_servers
+            :list_servers
         ).returns([sql_server])
 
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          nil
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(
+            verb,
+            request_path,
+            nil
         ).returns(mock_request)
       end
 
@@ -115,36 +115,36 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#create_server' do
       let(:response_xml) { Fixtures['create_sql_database_server'] }
-      let(:method) { :post }
+      let(:verb) { :post }
       let(:request_path) { '/servers' }
       let(:password) { 'User@123' }
       let(:login) { 'ms_open_tech' }
-      let(:location) { 'West US' }
+      let(:geo_location) { 'West US' }
 
       before do
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          anything
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(
+            verb,
+            request_path,
+            anything
         ).returns(mock_request)
 
         mock_request.stubs(:headers).returns(response_headers)
         mock_request.expects(:call).returns(
-          Nokogiri::XML response_xml
+            Nokogiri::XML response_xml
         ).at_least(0)
       end
 
       it 'create sql server' do
-        sql_server = subject.create_server(login, password, location)
+        sql_server = subject.create_server(login, password, geo_location)
         sql_server.name.must_equal 'gxyfzrhx2c'
         sql_server.administrator_login.must_equal login
-        sql_server.location.must_equal location
+        sql_server.location.must_equal geo_location
       end
     end
 
     describe '#set_sql_server_firewall_rule' do
       it 'create sql server' do
-        ip_range = { start_ip_address: '0.0.0.1', end_ip_address: '0.0.0.5' }
+        ip_range = {start_ip_address: '0.0.0.1', end_ip_address: '0.0.0.5'}
         exception = assert_raises(RuntimeError) do
           subject.set_sql_server_firewall_rule('zv2nfoah2t1', ip_range)
         end
@@ -156,7 +156,7 @@ describe 'Azure::SqlDatabaseManagementService' do
 
   describe 'Management Certificate authentication Endpoint' do
     before do
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
       mock_request.stubs(:headers).returns(response_headers)
       mock_request.expects(:call).returns(Nokogiri::XML response_xml).at_least(0)
       Azure.config.sql_database_authentication_mode = :management_certificate
@@ -164,15 +164,11 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#list_servers' do
       let(:response_xml) { Fixtures['list_sql_database'] }
-      let(:method) { :get }
+      let(:verb) { :get }
       let(:request_path) { '/servers' }
 
       before do
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          nil
-        ).returns(mock_request)
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       end
 
       it 'assembles a URI for the request' do
@@ -196,7 +192,7 @@ describe 'Azure::SqlDatabaseManagementService' do
     describe '#delete_server' do
       before do
         Azure::SqlDatabaseManagementService.any_instance.stubs(
-          :list_servers
+            :list_servers
         ).returns([])
       end
 
@@ -214,7 +210,7 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#list_sql_server_firewall_rules' do
       let(:response_xml) { Fixtures['list_firewall_management_endpoint'] }
-      let(:method) { :get }
+      let(:verb) { :get }
       let(:sql_server_name) { 'server1' }
       let(:request_path) { "/servers/#{sql_server_name}/firewallrules" }
 
@@ -223,13 +219,13 @@ describe 'Azure::SqlDatabaseManagementService' do
           server.name = sql_server_name
         end
         Azure::SqlDatabaseManagementService.any_instance.stubs(
-          :list_servers
+            :list_servers
         ).returns([sql_server])
 
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          nil
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(
+            verb,
+            request_path,
+            nil
         ).returns(mock_request)
       end
 
@@ -247,36 +243,36 @@ describe 'Azure::SqlDatabaseManagementService' do
 
     describe '#create_server' do
       let(:response_xml) { Fixtures['create_sql_database_server'] }
-      let(:method) { :post }
+      let(:verb) { :post }
       let(:request_path) { '/servers' }
       let(:password) { 'User@123' }
       let(:login) { 'ms_open_tech' }
-      let(:location) { 'West US' }
+      let(:geo_location) { 'West US' }
 
       before do
-        SqlManagementHttpRequest.stubs(:new).with(
-          method,
-          request_path,
-          anything
+        Azure::BaseManagement::SqlManagementHttpRequest.stubs(:new).with(
+            verb,
+            request_path,
+            anything
         ).returns(mock_request)
 
         mock_request.stubs(:headers).returns(response_headers)
         mock_request.expects(:call).returns(
-          Nokogiri::XML response_xml
+            Nokogiri::XML response_xml
         ).at_least(0)
       end
 
       it 'create sql server' do
-        sql_server = subject.create_server(login, password, location)
+        sql_server = subject.create_server(login, password, geo_location)
         sql_server.name.must_equal 'gxyfzrhx2c'
         sql_server.administrator_login.must_equal login
-        sql_server.location.must_equal location
+        sql_server.location.must_equal geo_location
       end
     end
 
     describe '#set_sql_server_firewall_rule' do
       it 'create sql server' do
-        ip_range = { start_ip_address: '0.0.0.1', end_ip_address: '0.0.0.5' }
+        ip_range = {start_ip_address: '0.0.0.1', end_ip_address: '0.0.0.5'}
         exception = assert_raises(RuntimeError) do
           subject.set_sql_server_firewall_rule('zv2nfoah2t1', ip_range)
         end