Make existing tests test something, return correct errors.

2 files changed, 15 insertions, 6 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c15205fb68f..3144ece977c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -164,12 +164,21 @@ class ProjectsController < ApplicationController
 
   def upload_image
     uploader = FileUploader.new('uploads', upload_path, accepted_images)
-    alt = params['markdown_img'].original_filename
-    uploader.store!(params['markdown_img'])
-    link = { 'alt' => File.basename(alt, '.*'),
-             'url' => File.join(root_url, uploader.url) }
+    image = params['markdown_img']
+
+    if image && accepted_images.map{ |format| image.content_type.include? format }.any?
+      alt = image.original_filename
+      uploader.store!(image)
+      link = { 'alt' => File.basename(alt, '.*'),
+               'url' => File.join(root_url, uploader.url) }
+    end
+
     respond_to do |format|
-      format.json { render json: { link: link } }
+      if link
+        format.json { render json: { link: link } }
+      else
+        format.json { render json: "Invalid file.", status: :unprocessable_entity }
+      end
     end
   end
 
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index cbc9271ac14..0fa987c93f6 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -25,7 +25,7 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def store!(file)
-    file.original_filename = self.class.generate_filename(file)
+    @filename = self.class.generate_filename(file)
     super
   end