aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/request_controller_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin@lenny.robin>2011-06-10 23:39:01 +0100
committerRobin Houston <robin@lenny.robin>2011-06-10 23:39:01 +0100
commit383c2b147b1a1921f893c7202e6ee6bb2427d09e (patch)
treea32a4346261c049b3cd7251e60d42309d6267973 /spec/controllers/request_controller_spec.rb
parent91cdb2663d1d39fb1dbd049f795c1800c7e20ddb (diff)
Move the non-fixture files in spec/fixtures to their own subdirectory,
so that we can run rake spec:db:fixtures:load without it choking on the files that aren't fixtures.
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 648a66e28..cc8513e7f 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -1174,7 +1174,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,
@@ -1198,7 +1198,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,