aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-03-03 17:00:20 +1100
committerHenare Degan <henare.degan@gmail.com>2013-03-03 17:00:20 +1100
commit56afb23d947c53cdb99ba8f1e88a47e8a8eb552c (patch)
tree380bb569fa583c04b01c092a2e9e577f2294dac8 /spec/controllers
parent34361f13ce0ef60a66bb1da01e7eaca5a0a9b25d (diff)
We can't mock this in Rails 3.1 so switch to using fixture_file_upload instead
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin_public_body_controller_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index c7cf48017..2070eb10c 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -77,8 +77,7 @@ describe AdminPublicBodyController, "when administering public bodies" do
before do
PublicBody.stub!(:import_csv).and_return([[],[]])
- @file_object = mock("a file upload", :read => 'some contents',
- :original_filename => 'contents.txt')
+ @file_object = fixture_file_upload('/files/fake-authority-type.csv')
end
it 'should handle a nil csv file param' do
@@ -97,7 +96,7 @@ describe AdminPublicBodyController, "when administering public bodies" do
it 'should assign the original filename to the view' do
post :import_csv, { :csv_file => @file_object,
:commit => 'Dry run'}
- assigns[:original_csv_file].should == 'contents.txt'
+ assigns[:original_csv_file].should == 'fake-authority-type.csv'
end
end