fog 0.5.2 → 0.5.3

data/spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb

@@ -8,7 +8,7 @@ shared_examples_for "a successful configure vapp" do
   end
 
   describe "#headers" do
-    its(:headers) { should include "Location" }
+    its(:headers) { should include("Location") }
   end
 end
 
@@ -16,7 +16,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :configure_vapp }
+    it { should respond_to(:configure_vapp) }
 
     let(:original_vapp_data) { vapp_data.dup }
     let(:vapp_data)          { @mock_vm.to_configure_vapp_hash }

data/spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb

@@ -5,7 +5,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :delete_internet_service }
+    it { should respond_to(:delete_internet_service) }
 
     describe "#delete_internet_service" do
       context "with a valid internet service uri" do

data/spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb

@@ -5,7 +5,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :delete_node }
+    it { should respond_to(:delete_node) }
 
     describe "#delete_node" do
       context "with a valid node service uri" do

data/spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb

@@ -14,7 +14,7 @@ shared_examples_for "a failed vapp deletion" do
   end
 
   describe "#headers" do
-    its(:headers) { should_not include "Location" }
+    its(:headers) { should_not include("Location") }
   end
 end
 
@@ -23,7 +23,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :delete_vapp }
+    it { should respond_to(:delete_vapp) }
 
     describe "#delete_vapp" do
       context "with a valid vapp uri" do
@@ -31,7 +31,7 @@ if Fog.mocking?
         let(:vdc) { @vcloud.vdcs.first }
 
         context "when there are no internet service nodes attached" do
-          it_should_behave_like "all delete responses"
+          it_should_behave_like("all delete responses")
 
           it "should change the mock data" do
             expect { subject }.to change { @mock_vdc.virtual_machines.count }.by(-1)
@@ -46,7 +46,7 @@ if Fog.mocking?
           end
 
           describe "#headers" do
-            its(:headers) { should include "Location" }
+            its(:headers) { should include("Location") }
           end
         end
 

data/spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_catalog_item }
+    it { should respond_to(:get_catalog_item) }
 
     describe "#get_catalog_item" do
       context "with a valid catalog_item_uri" do
@@ -13,20 +13,20 @@ if Fog.mocking?
         let(:mock_data_catalog_item) { @mock_data.catalog_item_from_href(@catalog_item.body[:href]) }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.catalogItem+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.catalogItem+xml") }
 
         describe "#body" do
           subject { @catalog_item.body }
 
           it { should have(8).items }
 
-          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+          it_should_behave_like("it has the standard vcloud v0.8 xmlns attributes")   # 3 keys
 
           its(:name) { should == "Item 0" }
 
-          it { should include :Entity }
-          it { should include :Link }
-          it { should include :Property }
+          it { should include(:Entity) }
+          it { should include(:Link) }
+          it { should include(:Property) }
 
           describe "Entity" do
             subject { @catalog_item.body[:Entity] }
@@ -55,9 +55,8 @@ if Fog.mocking?
       context "with a catalog uri that doesn't exist" do
         subject { lambda { @vcloud.get_catalog(URI.parse('https://www.fakey.com/api/v0.8/vdc/999/catalog')) } }
 
-        it_should_behave_like "a request for a resource that doesn't exist"
+        it_should_behave_like("a request for a resource that doesn't exist")
       end
     end
   end
-else
 end

data/spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_catalog }
+    it { should respond_to(:get_catalog) }
 
     describe "#get_catalog" do
       context "with a valid vdc catalog_uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @catalog }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.catalog+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.catalog+xml") }
 
         describe "#body" do
           subject { @catalog.body }
@@ -23,7 +23,7 @@ if Fog.mocking?
 
           its(:name) { should == @mock_vdc.catalog.name }
 
-          it { should include :CatalogItems }
+          it { should include(:CatalogItems) }
 
           describe "CatalogItems" do
             subject { @catalog.body[:CatalogItems] }

data/spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_customization_options }
+    it { should respond_to(:get_customization_options) }
 
     describe "#get_customization_options" do
       context "with a valid catalog_item customizations uri" do
@@ -14,7 +14,7 @@ if Fog.mocking?
         subject { @customization_options }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.catalogItemCustomizationParameters+xml") }
 
         describe "#body" do
           subject { @customization_options.body }

data/spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb

@@ -2,13 +2,13 @@ require 'vcloud/spec_helper'
 
 if Fog.mocking?
   shared_examples_for "a basic internet service" do
-    specify { service.should be_an_instance_of Hash }
+    specify { service.should be_an_instance_of(Hash) }
     specify { service.should have(14).attributes }
     specify { service[:Name].should == mock_service.name }
     specify { service[:Id].should == mock_service.object_id.to_s }
     specify { service[:Href].should == mock_service.href }
 
-    specify { service[:PublicIpAddress].should be_an_instance_of Hash }
+    specify { service[:PublicIpAddress].should be_an_instance_of(Hash) }
     specify { service[:PublicIpAddress].should have(3).attributes }
     specify { service[:PublicIpAddress][:Name].should == mock_ip.name }
     specify { service[:PublicIpAddress][:Href].should == mock_ip.href }
@@ -30,13 +30,13 @@ if Fog.mocking?
   end
 
   shared_examples_for "an internet service with a backup internet service set" do
-    specify { service[:BackupService].should be_an_instance_of Hash }
-    specify { service[:BackupService].should include :Href }
+    specify { service[:BackupService].should be_an_instance_of(Hash) }
+    specify { service[:BackupService].should include(:Href) }
     specify { service[:BackupService][:Href].should == @mock_backup_service.href }
   end
 
   shared_examples_for "a backup internet service" do
-    specify { service.should be_an_instance_of Hash }
+    specify { service.should be_an_instance_of(Hash) }
     specify { service.should have(14).attributes }
     specify { service[:Name].should == mock_service.name }
     specify { service[:Id].should == mock_service.object_id.to_s }
@@ -59,7 +59,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_internet_services }
+    it { should respond_to(:get_internet_services) }
 
     describe "#get_internet_services" do
       context "with a valid VDC internet_services_uri" do
@@ -71,7 +71,7 @@ if Fog.mocking?
         subject { @services }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.internetServicesList+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.internetServicesList+xml") }
 
         describe "#body" do
           subject { @services.body }
@@ -96,14 +96,14 @@ if Fog.mocking?
               let(:mock_service) { @mock_vdc.internet_service_collection.items[3] }
               let(:mock_ip) { mock_service._parent._parent }
 
-              it_should_behave_like "an internet service with a backup internet service set"
+              it_should_behave_like("an internet service with a backup internet service set")
             end
 
             context "for a backup internet service" do
               let(:service) { subject[4] }
               let(:mock_service) { @mock_vdc.internet_service_collection.backup_internet_services.first }
 
-              it_should_behave_like "a backup internet service"
+              it_should_behave_like("a backup internet service")
             end
           end
         end
@@ -115,8 +115,8 @@ if Fog.mocking?
         end
         subject { @services }
 
-        it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.internetServicesList+xml" }
+        it_should_behave_like("all responses")
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.internetServicesList+xml") }
 
         describe "#body" do
           subject { @services.body }
@@ -133,7 +133,7 @@ if Fog.mocking?
               let(:mock_service) { @mock_service_collection.items[idx] }
               let(:mock_ip) { @mock_public_ip }
 
-              it_should_behave_like "an internet service without a backup internet service set"
+              it_should_behave_like("an internet service without a backup internet service set")
             end
           end
         end
@@ -142,7 +142,7 @@ if Fog.mocking?
       context "with a public_ips_uri that doesn't exist" do
         subject { lambda { @vcloud.get_internet_services(URI.parse('https://www.fakey.c/piv8vc99')) } }
 
-        it_should_behave_like "a request for a resource that doesn't exist"
+        it_should_behave_like("a request for a resource that doesn't exist")
       end
     end
   end

data/spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_network_ip }
+    it { should respond_to(:get_network_ip) }
 
     describe "#get_network_ip" do
       context "with a valid ip_uri" do
@@ -15,7 +15,7 @@ if Fog.mocking?
         subject { @ip }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.ip+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.ip+xml") }
 
         describe "#body" do
           subject { @ip.body }

data/spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_network_ips }
+    it { should respond_to(:get_network_ips) }
 
     describe "#get_network_ips" do
       context "with a valid VDC network ips_uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @ips }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.ipAddressesList+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.ipAddressesList+xml") }
 
         describe "#body" do
           subject { @ips.body }
@@ -51,9 +51,8 @@ if Fog.mocking?
       context "with a network ips uri that doesn't exist" do
         subject { lambda { @vcloud.get_network_ips(URI.parse('https://www.fakey.c/piv8vc99')) } }
 
-        it_should_behave_like "a request for a resource that doesn't exist"
+        it_should_behave_like("a request for a resource that doesn't exist")
       end
     end
   end
-else
 end

data/spec/vcloud/terremark/ecloud/requests/get_network_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_network }
+    it { should respond_to(:get_network) }
 
     describe "#get_network" do
       context "with a valid network uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @network }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.network+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.network+xml") }
 
         describe "#body" do
           subject { @network.body }

data/spec/vcloud/terremark/ecloud/requests/get_node_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_node }
+    it { should respond_to(:get_node) }
 
     describe "#get_node" do
       context "with a valid nodes_uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @node }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.nodeService+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.nodeService+xml") }
 
         describe "#body" do
           subject { @node.body }

data/spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_nodes }
+    it { should respond_to(:get_nodes) }
 
     describe "#get_nodes" do
       context "with a valid nodes_uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @nodes }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.nodeService+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.nodeService+xml") }
 
         describe "#body" do
           subject { @nodes.body }

data/spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_public_ip }
+    it { should respond_to(:get_public_ip) }
 
     describe "#get_public_ip" do
       context "with a valid public_ip_uri" do
@@ -15,7 +15,7 @@ if Fog.mocking?
         subject { @public_ip }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.publicIp+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.publicIp+xml") }
 
         describe "#body" do
           subject { @public_ip.body }

data/spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_public_ips }
+    it { should respond_to(:get_public_ips) }
 
     describe "#get_public_ips" do
       context "with a valid public_ips_uri" do
@@ -12,7 +12,7 @@ if Fog.mocking?
         subject { @public_ips }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.tmrk.ecloud.publicIpsList+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.tmrk.ecloud.publicIpsList+xml") }
 
         describe "#body" do
           subject { @public_ips.body }

data/spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_vapp }
+    it { should respond_to(:get_vapp) }
 
     describe "#get_vapp" do
       context "with a valid vapp_uri" do
@@ -13,7 +13,7 @@ if Fog.mocking?
         let(:vapp_id) { @vapp.body[:href].split("/").last }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.vApp+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.vApp+xml") }
 
         describe "#body" do
           subject { @vapp.body }
@@ -25,7 +25,7 @@ if Fog.mocking?
                                                             :type,                         :xmlns,
                                                             :xmlns_xsd,                    :xmlns_xsi] }
 
-          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+          it_should_behave_like("it has the standard vcloud v0.8 xmlns attributes")   # 3 keys
 
           its(:href)   { should == @mock_vm.href }
           its(:name)   { should == @mock_vm.name }
@@ -43,7 +43,7 @@ if Fog.mocking?
           describe "NetworkConnectionSection" do
             subject { @vapp.body[:NetworkConnectionSection] }
 
-            it { should include :NetworkConnection }
+            it { should include(:NetworkConnection) }
 
             describe "NetworkConnection" do
               subject { @vapp.body[:NetworkConnectionSection][:NetworkConnection] }
@@ -118,9 +118,8 @@ if Fog.mocking?
       context "with a vapp uri that doesn't exist" do
         subject { lambda { @vcloud.get_vapp(URI.parse('https://www.fakey.com/api/v0.8/vApp/99999')) } }
 
-        it_should_behave_like "a request for a resource that doesn't exist"
+        it_should_behave_like("a request for a resource that doesn't exist")
       end
     end
   end
-else
 end

data/spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :get_vdc }
+    it { should respond_to(:get_vdc) }
 
     describe "#get_vdc" do
       context "with a valid vdc uri" do
@@ -12,14 +12,14 @@ if Fog.mocking?
         subject { @vdc }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/vnd.vmware.vcloud.vdc+xml" }
+        it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.vdc+xml") }
 
         describe "#body" do
           subject { @vdc.body }
 
           it { should have(11).items }
 
-          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+          it_should_behave_like("it has the standard vcloud v0.8 xmlns attributes")   # 3 keys
 
           its(:href) { should == @mock_vdc.href }
           its(:name) { should == @mock_vdc.name }
@@ -72,15 +72,15 @@ if Fog.mocking?
           describe "[:ResourceEntities][:ResourceEntity]" do
             context "[0]" do
               subject { @vdc.body[:ResourceEntities][:ResourceEntity][0] }
-              it { should be_a_vapp_link_to @mock_vdc.virtual_machines[0] }
+              it { should be_a_vapp_link_to(@mock_vdc.virtual_machines[0]) }
             end
             context "[1]" do
               subject { @vdc.body[:ResourceEntities][:ResourceEntity][1] }
-              it { should be_a_vapp_link_to @mock_vdc.virtual_machines[1] }
+              it { should be_a_vapp_link_to(@mock_vdc.virtual_machines[1]) }
             end
             context "[2]" do
               subject { @vdc.body[:ResourceEntities][:ResourceEntity][2] }
-              it { should be_a_vapp_link_to @mock_vdc.virtual_machines[2] }
+              it { should be_a_vapp_link_to(@mock_vdc.virtual_machines[2]) }
             end
           end
 
@@ -92,11 +92,11 @@ if Fog.mocking?
           describe "[:AvailableNetworks][:Network]" do
             context "[0]" do
               subject { @vdc.body[:AvailableNetworks][:Network][0] }
-              it { should be_a_network_link_to @mock_vdc.networks[0] }
+              it { should be_a_network_link_to(@mock_vdc.networks[0]) }
             end
             context "[1]" do
               subject { @vdc.body[:AvailableNetworks][:Network][1] }
-              it { should be_a_network_link_to @mock_vdc.networks[1] }
+              it { should be_a_network_link_to(@mock_vdc.networks[1]) }
             end
           end
         end
@@ -105,9 +105,8 @@ if Fog.mocking?
       context "with a vdc uri that doesn't exist" do
         subject { lambda { @vcloud.get_vdc(URI.parse('https://www.fakey.com/api/v0.8/vdc/999')) } }
 
-        it_should_behave_like "a request for a resource that doesn't exist"
+        it_should_behave_like("a request for a resource that doesn't exist")
       end
     end
   end
-else
 end