From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- client/specs/content_spec.rb | 22 ---------------------- client/specs/instances_spec.rb | 6 +++--- client/specs/storage_snapshot_spec.rb | 2 +- client/specs/storage_volume_spec.rb | 2 +- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/client/specs/content_spec.rb b/client/specs/content_spec.rb index 5725f2d..cea260f 100644 --- a/client/specs/content_spec.rb +++ b/client/specs/content_spec.rb @@ -119,28 +119,6 @@ describe "return HTML in different browsers" do end end - it "Chrome" do - header_hash = { - 'Accept' => "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", - 'User-agent' => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.790.0 Safari/535.1" - } - client.get(header_hash) do |response, request, &block| - response.code.should == 200 - response.headers[:content_type].should =~ /^text\/html/ - end - end - - it "Safari" do - header_hash = { - 'Accept' => "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", - 'User-agent' => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; da-dk) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" - } - client.get(header_hash) do |response, request, &block| - response.code.should == 200 - response.headers[:content_type].should =~ /^text\/html/ - end - end - it "Opera" do header_hash = { 'Accept' => "text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1", diff --git a/client/specs/instances_spec.rb b/client/specs/instances_spec.rb index 52bf32e..f7fc7e7 100644 --- a/client/specs/instances_spec.rb +++ b/client/specs/instances_spec.rb @@ -78,8 +78,8 @@ describe "instances" do instance.hardware_profile.should_not be_nil instance.hardware_profile.should_not be_nil instance.hardware_profile.uri.should eql( API_URL + "/hardware_profiles/m1-large" ) - instance.hardware_profile.memory.value.should eql(10240.0) - instance.hardware_profile.storage.value.should eql(850.0) + instance.hardware_profile.memory.value.should eql('10240') + instance.hardware_profile.storage.value.should eql('850') instance.state.should eql( "RUNNING" ) instance.actions.should_not be_nil end @@ -132,7 +132,7 @@ describe "instances" do instance.id.should match( /inst[0-9]+/ ) instance.image.id.should eql( 'img1' ) instance.hardware_profile.id.should eql( 'm1-xlarge' ) - instance.hardware_profile.memory.value.should eql(12288.0) + instance.hardware_profile.memory.value.should eql('12288') instance.realm.id.should eql( 'us' ) end end diff --git a/client/specs/storage_snapshot_spec.rb b/client/specs/storage_snapshot_spec.rb index f1ae43b..55e5fa1 100644 --- a/client/specs/storage_snapshot_spec.rb +++ b/client/specs/storage_snapshot_spec.rb @@ -31,7 +31,7 @@ describe "storage snapshot" do storage_snapshots.should_not be_nil storage_snapshots.should_not be_empty ids = storage_snapshots.collect{|e| e.id} - ids.size.should eql( 2 ) + ids.size.should eql( 3 ) ids.should include( 'snap2' ) ids.should include( 'snap3' ) end diff --git a/client/specs/storage_volume_spec.rb b/client/specs/storage_volume_spec.rb index 4ed23b7..b0c567d 100644 --- a/client/specs/storage_volume_spec.rb +++ b/client/specs/storage_volume_spec.rb @@ -31,7 +31,7 @@ describe "storage volumes" do storage_volumes.should_not be_nil storage_volumes.should_not be_empty ids = storage_volumes.collect{|e| e.id} - ids.size.should eql( 2 ) + ids.size.should eql( 3 ) ids.should include( 'vol2' ) ids.should include( 'vol3' ) end -- 1.7.4.4
