updated to Rails 4.2

2015-02-18 10:41:26 +01:00
parent fcc5a85a76
commit 56acd4c3c3
16 changed files with 199 additions and 132 deletions
--- a/spec/controllers/exercises_controller_spec.rb
+++ b/spec/controllers/exercises_controller_spec.rb
@ -31,7 +31,8 @@ describe ExercisesController do
    end

    context 'with a file upload' do
-      let(:files_attributes) { {'0' => FactoryGirl.build(:file, content: fixture_file_upload('upload.rb', 'text/x-ruby')).attributes} }
+      let(:file_upload) { fixture_file_upload('upload.rb', 'text/x-ruby') }
+      let(:files_attributes) { {'0' => FactoryGirl.build(:file).attributes.merge(content: file_upload)} }
      let(:request) { proc { post :create, exercise: exercise_attributes.merge(files_attributes: files_attributes) } }

      it 'creates the file' do