diff options
Diffstat (limited to 'spec/integration')
-rw-r--r-- | spec/integration/errors_spec.rb | 9 | ||||
-rw-r--r-- | spec/integration/search_request_spec.rb | 6 |
2 files changed, 2 insertions, 13 deletions
diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb index a44ed7051..0e3157ca8 100644 --- a/spec/integration/errors_spec.rb +++ b/spec/integration/errors_spec.rb @@ -4,26 +4,18 @@ describe "When rendering errors" do before(:each) do load_raw_emails_data - ActionController::Base.consider_all_requests_local = false - end - - after(:each) do - ActionController::Base.consider_all_requests_local = true end it "should render a 404 for unrouteable URLs" do get("/frobsnasm") - response.body.should include("The page doesn't exist") response.code.should == "404" end it "should render a 404 for users that don't exist" do get("/user/wobsnasm") - response.body.should include("The page doesn't exist") response.code.should == "404" end it "should render a 404 for bodies that don't exist" do get("/body/wobsnasm") - response.body.should include("The page doesn't exist") response.code.should == "404" end it "should render a 500 for general errors" do @@ -46,7 +38,6 @@ describe "When rendering errors" do end it "should render a 404 for non-existent 'details' pages for requests" do get("/details/request/wobble" ) - response.body.should include("The page doesn't exist") response.code.should == "404" end end diff --git a/spec/integration/search_request_spec.rb b/spec/integration/search_request_spec.rb index c564032a6..23a62e97b 100644 --- a/spec/integration/search_request_spec.rb +++ b/spec/integration/search_request_spec.rb @@ -13,10 +13,8 @@ describe "When searching" do end it "should redirect requests with search in query string to URL-based page" do - url = '/search/all?query=bob' - request_via_redirect("post", url) - response.request.url.should_not include(url) - response.request.url.should include("/search/bob/all") + post '/search/all?query=bob' + response.should redirect_to "/en/search/bob/all" end it "should correctly execute simple search" do |