> + puts blob.inspect Is this intentional?
Regards, Dies Koper > -----Original Message----- > From: [email protected] [mailto:[email protected]] > Sent: Monday, 21 May 2012 8:07 PM > To: [email protected] > Subject: [PATCH core 34/51] Client: Fixed client rspec tests to work against > modular version > > From: Michal Fojtik <[email protected]> > > > Signed-off-by: Michal fojtik <[email protected]> > --- > client/specs/buckets_spec.rb | 1 + > client/specs/content_spec.rb | 4 ++-- > server/views/blobs/show.xml.haml | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/client/specs/buckets_spec.rb b/client/specs/buckets_spec.rb > index 81b1e58..b897e0c 100644 > --- a/client/specs/buckets_spec.rb > +++ b/client/specs/buckets_spec.rb > @@ -96,6 +96,7 @@ describe "Blobs" do > blob_list.size.should eql(bucket.size.to_i) > blob_list.each do |b_id| > blob = client.blob({"bucket" => bucket.name, :id => b_id}) > + puts blob.inspect > blob.bucket.should_not be_nil > blob.bucket.should be_a(String) > blob.bucket.should eql(bucket.name) > diff --git a/client/specs/content_spec.rb b/client/specs/content_spec.rb > index c953660..ffd222c 100644 > --- a/client/specs/content_spec.rb > +++ b/client/specs/content_spec.rb > @@ -58,7 +58,7 @@ end > describe "return HTML in different browsers" do > > it "wants XML using format parameter" do > - client['?format=xml'].get('Accept' => 'application/xhtml+xml') do > |response, request, &block| > + client.get(:params => { 'format' => 'xml' }, 'Accept' => > 'application/xhtml+xml') do |response, request, &block| > response.code.should == 200 > response.headers[:content_type].should =~ /^application\/xml/ > end > @@ -71,7 +71,7 @@ describe "return HTML in different browsers" do > end > > it "wants HTML using format parameter and accept set to XML" do > - client['?format=html'].get('Accept' => 'application/xml') do |response, > request, &block| > + client.get(:params => { 'format' => 'html'}, 'Accept' => 'application/xml') > do |response, request, &block| > response.code.should == 200 > response.headers[:content_type].should =~ /^text\/html/ > end > diff --git a/server/views/blobs/show.xml.haml > b/server/views/blobs/show.xml.haml > index bde9e80..ba3d4de 100644 > --- a/server/views/blobs/show.xml.haml > +++ b/server/views/blobs/show.xml.haml > @@ -1,6 +1,6 @@ > !!! XML > %blob{:href => bucket_url(@blob.bucket) + '/' + @blob.id, :id => @blob.id} > - %bucket{ :id => @blob.bucket, :href => bucket_url(@blob.bucket)} > + %bucket{ :id => @blob.bucket, :href => bucket_url(@blob.bucket), :rel > => :bucket} > - @blob.attributes.select{ |attr| (attr!=:id && > attr!=:user_metadata) }.each do |attribute| > - next if attribute == :bucket > - unless attribute == :content > -- > 1.7.10.1 >
