aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/request_controller_spec.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-06-14 10:19:45 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-06-14 10:19:45 +0100
commitc78e3b2aba67ad9844175e1e27016692759f498a (patch)
treeb2555bab443ce173356c49dffeb7ebcc1224ea3d /spec/controllers/request_controller_spec.rb
parent557a25aec4f41ebaba67349011052e04e1c68f9f (diff)
parentf2b779ec4e095afeb1b1da2a92a335069c59dccd (diff)
merge WTDK changes to master (preparation for closing WTDK branch and deploying WTDK website straight from master)
Diffstat (limited to 'spec/controllers/request_controller_spec.rb')
-rw-r--r--spec/controllers/request_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 41b4b6b5a..a543995f6 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -1178,7 +1178,7 @@ describe RequestController, "authority uploads a response from the web interface
session[:user_id] = @normal_user.id
# post up a photo of the parrot
- parrot_upload = fixture_file_upload('parrot.png','image/png')
+ parrot_upload = fixture_file_upload('files/parrot.png','image/png')
post :upload_response, :url_title => 'why_do_you_have_such_a_fancy_dog',
:body => "Find attached a picture of a parrot",
:file_1 => parrot_upload,
@@ -1202,7 +1202,7 @@ describe RequestController, "authority uploads a response from the web interface
session[:user_id] = @foi_officer_user.id
# post up a photo of the parrot
- parrot_upload = fixture_file_upload('parrot.png','image/png')
+ parrot_upload = fixture_file_upload('files/parrot.png','image/png')
post :upload_response, :url_title => 'why_do_you_have_such_a_fancy_dog',
:body => "Find attached a picture of a parrot",
:file_1 => parrot_upload,