aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/request_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-04-27 10:18:48 +0100
committerRobin Houston <robin.houston@gmail.com>2012-04-27 10:18:48 +0100
commita7d0d25b323d9ca7f31405482f9462570e0cbeaf (patch)
tree644b8f34e0ca59ae0262c1a936ab65b737b0fcc4 /spec/controllers/request_controller_spec.rb
parent3a18daf0b880ad9f7ee3591c3c777edfd5688b34 (diff)
parent6df23e10dfbf3351d3953f99062d46253b5ec94a (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'spec/controllers/request_controller_spec.rb')
-rw-r--r--spec/controllers/request_controller_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index f50158ff9..81c69db76 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -121,6 +121,7 @@ describe RequestController, "when showing one request" do
before(:each) do
load_raw_emails_data
+ FileUtils.rm_rf File.join(File.dirname(__FILE__), "../../cache/zips")
end
it "should be successful" do
@@ -565,7 +566,7 @@ end
# XXX do this for invalid ids
# it "should render 404 file" do
-# response.should render_template("#{RAILS_ROOT}/public/404.html")
+# response.should render_template("#{Rails.root}/public/404.html")
# response.headers["Status"].should == "404 Not Found"
# end