[PATCH core 6/6] Client: Fixed rspec tests that were failing due to changes in server

[mfojtik]

From: Michal Fojtik <mfoj...@redhat.com>


Signed-off-by: Michal fojtik <mfoj...@redhat.com>
---
 client/specs/content_spec.rb          |    6 +++++-
 client/specs/storage_snapshot_spec.rb |   18 ++++++++++--------
 client/specs/storage_volume_spec.rb   |   22 ++++++++++++----------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/client/specs/content_spec.rb b/client/specs/content_spec.rb
index cea260f..c953660 100644
--- a/client/specs/content_spec.rb
+++ b/client/specs/content_spec.rb
@@ -31,7 +31,11 @@ describe "return JSON" do
 
   it 'should return JSON when using application/json, */*' do
     header_hash = {
-      'Accept' => "application/json, */*"
+      # FIXME: There is a bug in rack-accept that cause to respond with HTML
+      # to the configuration below.
+      #
+      # 'Accept' => "application/json, */*"
+      'Accept' => "application/json"
     }
     client.get(header_hash) do |response, request, &block|
       response.code.should == 200
diff --git a/client/specs/storage_snapshot_spec.rb 
b/client/specs/storage_snapshot_spec.rb
index 55e5fa1..94f149c 100644
--- a/client/specs/storage_snapshot_spec.rb
+++ b/client/specs/storage_snapshot_spec.rb
@@ -62,18 +62,20 @@ describe "storage snapshot" do
 
   it "should return nil for unknown storage volume by ID" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_snapshot = client.storage_snapshot( "bogus" )
-      storage_snapshot.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.storage_snapshot( "bogus" )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
   it "should return nil for unknown storage volume by URI" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_snapshot = client.fetch_storage_snapshot( API_URL + 
'/storage_snapshots/bogus' )
-      storage_snapshot.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.fetch_storage_snapshot( API_URL + '/storage_snapshots/bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
 end
diff --git a/client/specs/storage_volume_spec.rb 
b/client/specs/storage_volume_spec.rb
index b0c567d..8fb153e 100644
--- a/client/specs/storage_volume_spec.rb
+++ b/client/specs/storage_volume_spec.rb
@@ -69,20 +69,22 @@ describe "storage volumes" do
     end
   end
 
-  it "should return nil for unknown storage volume by ID" do
+  it "should raise exception for unknown storage volume by ID" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_volume = client.storage_volume( 'bogus' )
-      storage_volume.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.storage_volume( 'bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
-  it "should return nil for unknown storage volume by URI" do
+  it "should raise exception for unknown storage volume by URI" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_volume = client.fetch_storage_volume( API_URL + 
'/storage_volumes/bogus' )
-      storage_volume.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.fetch_storage_volume( API_URL + '/storage_volumes/bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
 
-- 
1.7.9.1