diff options
| -rw-r--r-- | spec/views/public_body/show.rhtml_spec.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index b599cebd6..a6cac33fa 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -58,9 +58,9 @@ describe "public_body/show" do end it "should cope with Xapian being down" do - assigns[:xapian_requests] = nil + assign(:xapian_requests, nil) render - response.should have_tag("p", /The search index is currently offline/m) + response.should match "The search index is currently offline" end it "should link to Charity Commission site if we have numbers to do so" do @@ -68,11 +68,11 @@ describe "public_body/show" do @pb.stub!(:get_tag_values).and_return(['98765', '12345']) render - response.should have_tag("div#header_right") do - with_tag("a[href*=?]", /charity-commission.gov.uk.*RegisteredCharityNumber=98765$/) + response.should have_selector("div#header_right") do + have_selector "a", :href => /charity-commission.gov.uk.*RegisteredCharityNumber=98765$/ end - response.should have_tag("div#header_right") do - with_tag("a[href*=?]", /charity-commission.gov.uk.*RegisteredCharityNumber=12345$/) + response.should have_selector("div#header_right") do + have_selector "a", :href => /www.charity-commission.gov.uk.*RegisteredCharityNumber=12345$/ end end @@ -81,16 +81,16 @@ describe "public_body/show" do @pb.stub!(:get_tag_values).and_return(['SC1234']) render - response.should have_tag("div#header_right") do - with_tag("a[href*=?]", /www.oscr.org.uk.*id=SC1234$/) + response.should have_selector("div#header_right") do + have_selector "a", :href => /www.oscr.org.uk.*id=SC1234$/ end end it "should not link to Charity Commission site if we don't have number" do render - response.should have_tag("div#header_right") do - without_tag("a[href*=?]", /charity-commission.gov.uk/) + response.should have_selector("div#header_right") do + have_selector "a", :href => /charity-commission.gov.uk/ end end |