16 files changed, 5 insertions, 6 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,
diff --git a/spec/fixtures/fake-authority-type.csv b/spec/fixtures/files/fake-authority-type.csv
index 4aa618ad1..4aa618ad1 100644
--- a/spec/fixtures/fake-authority-type.csv
+++ b/spec/fixtures/files/fake-authority-type.csv
diff --git a/spec/fixtures/humberside-police-odd-mime-type.email b/spec/fixtures/files/humberside-police-odd-mime-type.email
index 5514b29da..5514b29da 100644
--- a/spec/fixtures/humberside-police-odd-mime-type.email
+++ b/spec/fixtures/files/humberside-police-odd-mime-type.email
diff --git a/spec/fixtures/incoming-request-attach-attachments.email b/spec/fixtures/files/incoming-request-attach-attachments.email
index efcf1a4d1..efcf1a4d1 100644
--- a/spec/fixtures/incoming-request-attach-attachments.email
+++ b/spec/fixtures/files/incoming-request-attach-attachments.email
diff --git a/spec/fixtures/incoming-request-bad-uuencoding.email b/spec/fixtures/files/incoming-request-bad-uuencoding.email
index c1288a253..c1288a253 100644
--- a/spec/fixtures/incoming-request-bad-uuencoding.email
+++ b/spec/fixtures/files/incoming-request-bad-uuencoding.email
diff --git a/spec/fixtures/incoming-request-oft-attachments.email b/spec/fixtures/files/incoming-request-oft-attachments.email
index 13ba77680..13ba77680 100644
--- a/spec/fixtures/incoming-request-oft-attachments.email
+++ b/spec/fixtures/files/incoming-request-oft-attachments.email
diff --git a/spec/fixtures/incoming-request-plain.email b/spec/fixtures/files/incoming-request-plain.email
index 8aca7707b..8aca7707b 100644
--- a/spec/fixtures/incoming-request-plain.email
+++ b/spec/fixtures/files/incoming-request-plain.email
diff --git a/spec/fixtures/incoming-request-tnef-attachments.email b/spec/fixtures/files/incoming-request-tnef-attachments.email
index db93c1b8f..db93c1b8f 100644
--- a/spec/fixtures/incoming-request-tnef-attachments.email
+++ b/spec/fixtures/files/incoming-request-tnef-attachments.email
diff --git a/spec/fixtures/incoming-request-two-same-name.email b/spec/fixtures/files/incoming-request-two-same-name.email
index f1024d607..f1024d607 100644
--- a/spec/fixtures/incoming-request-two-same-name.email
+++ b/spec/fixtures/files/incoming-request-two-same-name.email
diff --git a/spec/fixtures/multiple-unquoted-display-names.email b/spec/fixtures/files/multiple-unquoted-display-names.email
index e3a742c83..e3a742c83 100644
--- a/spec/fixtures/multiple-unquoted-display-names.email
+++ b/spec/fixtures/files/multiple-unquoted-display-names.email
diff --git a/spec/fixtures/parrot.jpg b/spec/fixtures/files/parrot.jpg
index 22fd8e4de..22fd8e4de 100644
--- a/spec/fixtures/parrot.jpg
+++ b/spec/fixtures/files/parrot.jpg
diff --git a/spec/fixtures/parrot.png b/spec/fixtures/files/parrot.png
index 77442a3d5..77442a3d5 100644
--- a/spec/fixtures/parrot.png
+++ b/spec/fixtures/files/parrot.png
diff --git a/spec/fixtures/psni.pdf b/spec/fixtures/files/psni.pdf
index daca3f4ec..daca3f4ec 100644
--- a/spec/fixtures/psni.pdf
+++ b/spec/fixtures/files/psni.pdf
diff --git a/spec/fixtures/tfl.pdf b/spec/fixtures/files/tfl.pdf
index 695780a3c..695780a3c 100644
--- a/spec/fixtures/tfl.pdf
+++ b/spec/fixtures/files/tfl.pdf
diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb
index 41e8c8f4e..c647fe522 100644
--- a/spec/lib/tmail_extensions_spec.rb
+++ b/spec/lib/tmail_extensions_spec.rb
@@ -23,8 +23,7 @@ describe "when using TMail" do
     end
 
     it 'should parse multiple to addresses with unqoted display names' do
-        example_file = File.join(Spec::Runner.configuration.fixture_path, 'multiple-unquoted-display-names.email')
-        mail = TMail::Mail.parse(File.read(example_file))
+        mail = TMail::Mail.parse(load_file_fixture('multiple-unquoted-display-names.email'))
         mail.to.should == ["request-66666-caa77777@whatdotheyknow.com", "foi@example.com"]
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c6e894584..6439a0f19 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -56,7 +56,7 @@ end
 
 # XXX No idea what namespace/class/module to put this in 
 def receive_incoming_mail(email_name, email_to, email_from = 'geraldinequango@localhost')
-    email_name = File.join(Spec::Runner.configuration.fixture_path, email_name)
+    email_name = file_fixture_name(email_name)
     content = File.read(email_name)
     content.gsub!('EMAIL_TO', email_to)
     content.gsub!('EMAIL_FROM', email_from)
@@ -64,7 +64,7 @@ def receive_incoming_mail(email_name, email_to, email_from = 'geraldinequango@lo
 end
 
 def file_fixture_name(file_name)
-    return File.join(Spec::Runner.configuration.fixture_path, file_name)
+    return File.join(Spec::Runner.configuration.fixture_path, "files", file_name)
 end
 
 def load_file_fixture(file_name)