From c445930effc4a6aaa5921192bee4abbb686eae5f Mon Sep 17 00:00:00 2001
From: Nick Osborn <nick.osborn@digital.cabinet-office.gov.uk>
Date: Tue, 24 Sep 2013 21:08:43 +0100
Subject: [PATCH] [vcloud_director|tests] Make tests work

---
 tests/vcloud_director/models/compute/organizations_tests.rb   | 4 ++--
 tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb | 2 +-
 tests/vcloud_director/models/compute/vdcs_tests.rb            | 4 +++-
 tests/vcloud_director/models/compute/vms_tests.rb             | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/vcloud_director/models/compute/organizations_tests.rb b/tests/vcloud_director/models/compute/organizations_tests.rb
index 55a5af8ff..18fa51a11 100644
--- a/tests/vcloud_director/models/compute/organizations_tests.rb
+++ b/tests/vcloud_director/models/compute/organizations_tests.rb
@@ -5,12 +5,12 @@ VCR.use_cassette(File.basename(__FILE__)) do
   Shindo.tests("Compute::VcloudDirector | organizations", ['vclouddirector', 'all']) do
     pending if Fog.mocking?
     organizations = vcloud_director.organizations
-    tests("#There is one organization").returns(1){ organizations.size }
+    tests("#There is at least one organization").returns(true){ organizations.size >= 1 }
 
     org = organizations.first
 
     tests("Compute::VcloudDirector | organization") do
-      tests("#name").returns("DevOps"){ org.name }
+      tests("#name").returns(String){ org.name.class }
       tests("#type").returns("application/vnd.vmware.vcloud.org+xml"){ org.type }
     end
 
diff --git a/tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb b/tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb
index 8de49ae7f..2d73f481f 100644
--- a/tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb
+++ b/tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb
@@ -13,8 +13,8 @@ VCR.use_cassette(File.basename(__FILE__)) do
 
   Shindo.tests("Compute::VcloudDirector | vapp", ['vclouddirector', 'creation']) do
     pending if Fog.mocking?
+    pending # FIXME: vCloud environment needs to be set up in advance
     tests("#it creates a vApp from a catalog item").returns(true){ the_catalog_item.instantiate(VAPP_NAME, { :network_id => the_network.id, :network_name => NETWORK_NAME}) }
-    pending # FIXME! fails after 790ed63
     vapp = vapps.get_by_name(VAPP_NAME)
     tests("#Finds the just created vApp").returns(VAPP_NAME) { vapp.name }
     tests("#it has one vm").returns(1) { vapp.vms.size}
diff --git a/tests/vcloud_director/models/compute/vdcs_tests.rb b/tests/vcloud_director/models/compute/vdcs_tests.rb
index e21643f2a..a8bedee16 100644
--- a/tests/vcloud_director/models/compute/vdcs_tests.rb
+++ b/tests/vcloud_director/models/compute/vdcs_tests.rb
@@ -29,7 +29,9 @@ VCR.use_cassette(File.basename(__FILE__)) do
     end
 
     tests("Compute::VcloudDirector | vdc", ['lazy load attrs']) do
-      vdc.lazy_load_attrs.each do |lazy_attr|
+      lazy_attrs = vdc.lazy_load_attrs
+      lazy_attrs.delete(:storage_capacity) if vcloud_director.api_version.to_f >= 5.1
+      lazy_attrs.each do |lazy_attr|
         tests("##{lazy_attr} is now loaded").returns(true) { vdc.attributes[lazy_attr] != NonLoaded }
       end
     end
diff --git a/tests/vcloud_director/models/compute/vms_tests.rb b/tests/vcloud_director/models/compute/vms_tests.rb
index 2419e5c12..6db3eaf99 100644
--- a/tests/vcloud_director/models/compute/vms_tests.rb
+++ b/tests/vcloud_director/models/compute/vms_tests.rb
@@ -4,7 +4,7 @@ VCR.use_cassette(File.basename(__FILE__)) do
 
   Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
     pending if Fog.mocking?
-    vapp = vapps.detect {|vapp| vapp.vms.size >= 1 }
+    vapp = vapps.detect {|v| v.vms.size >= 1}
 
     tests("#There is more than one vm").returns(true){ vapp.vms.size >= 1 }
 
@@ -43,7 +43,7 @@ VCR.use_cassette(File.basename(__FILE__)) do
       tests("#address_on_parent").returns(0){ hard_disk.address_on_parent }
       tests("#parent").returns(2){ hard_disk.parent }
       tests("#capacity").returns(Fixnum){ hard_disk.capacity.class }
-      tests("#bus_sub_type").returns("lsilogicsas"){ hard_disk.bus_sub_type }
+      tests("#bus_sub_type").returns(String){ hard_disk.bus_sub_type.class }
       tests("#bus_type").returns(6){ hard_disk.bus_type }
     end