spec/link_header_spec.rb in sinatra-contrib-1.4.7 vs spec/link_header_spec.rb in sinatra-contrib-2.0.0.beta1

@@ -28,72 +28,72 @@
   end
 
   describe :link do
     it "sets link headers" do
       get '/'
-      headers['Link'].lines.should include('<booyah>; rel="something"')
+      expect(headers['Link'].lines).to include('<booyah>; rel="something"')
     end
 
     it "returns link html tags" do
       get '/'
-      body.should == '<link href="booyah" rel="something" />'
+      expect(body).to eq('<link href="booyah" rel="something" />')
     end
 
     it "takes an options hash" do
       get '/'
       elements = ["<something>", "foo=\"bar\"", "rel=\"from-filter\""]
-      headers['Link'].lines.first.strip.split('; ').sort.should == elements
+      expect(headers['Link'].split(",\n").first.strip.split('; ').sort).to eq(elements)
     end
   end
 
   describe :stylesheet do
     it 'sets link headers' do
       get '/style'
-      headers['Link'].should match(%r{^</style\.css>;})
+      expect(headers['Link']).to match(%r{^</style\.css>;})
     end
 
     it 'sets type to text/css' do
       get '/style'
-      headers['Link'].should include('type="text/css"')
+      expect(headers['Link']).to include('type="text/css"')
     end
 
     it 'sets rel to stylesheet' do
       get '/style'
-      headers['Link'].should include('rel="stylesheet"')
+      expect(headers['Link']).to include('rel="stylesheet"')
     end
 
     it 'returns html tag' do
       get '/style'
-      body.should match(%r{^<link href="/style\.css"})
+      expect(body).to match(%r{^<link href="/style\.css"})
     end
   end
 
   describe :prefetch do
     it 'sets link headers' do
       get '/prefetch'
-      headers['Link'].should match(%r{^</foo>;})
+      expect(headers['Link']).to match(%r{^</foo>;})
     end
 
     it 'sets rel to prefetch' do
       get '/prefetch'
-      headers['Link'].should include('rel="prefetch"')
+      expect(headers['Link']).to include('rel="prefetch"')
     end
 
     it 'returns html tag' do
       get '/prefetch'
-      body.should == '<link href="/foo" rel="prefetch" />'
+      expect(body).to eq('<link href="/foo" rel="prefetch" />')
     end
   end
 
   describe :link_headers do
     it 'generates html for all link headers' do
       get '/link_headers'
-      body.should include('<link href="/foo" rel="prefetch" />')
-      body.should include('<link href="/style.css" ')
+      expect(body).to include('<link href="/foo" rel="prefetch" />')
+      expect(body).to include('<link href="/style.css" ')
     end
 
     it "respects Link headers not generated on its own" do
       get '/link_headers'
-      body.should include('<link href="foo" bar="baz" />')
+      expect(body).to include('<link href="foo" bar="baz" />')
     end
   end
 end