Commit 8bec6b0b authored by Marin Jankovski's avatar Marin Jankovski

Make existing tests test something, return correct errors.

parent 2a8aa742
...@@ -164,12 +164,21 @@ class ProjectsController < ApplicationController ...@@ -164,12 +164,21 @@ class ProjectsController < ApplicationController
def upload_image def upload_image
uploader = FileUploader.new('uploads', upload_path, accepted_images) uploader = FileUploader.new('uploads', upload_path, accepted_images)
alt = params['markdown_img'].original_filename image = params['markdown_img']
uploader.store!(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, '.*'), link = { 'alt' => File.basename(alt, '.*'),
'url' => File.join(root_url, uploader.url) } 'url' => File.join(root_url, uploader.url) }
end
respond_to do |format| respond_to do |format|
if link
format.json { render json: { link: link } } format.json { render json: { link: link } }
else
format.json { render json: "Invalid file.", status: :unprocessable_entity }
end
end end
end end
......
...@@ -25,7 +25,7 @@ class FileUploader < CarrierWave::Uploader::Base ...@@ -25,7 +25,7 @@ class FileUploader < CarrierWave::Uploader::Base
end end
def store!(file) def store!(file)
file.original_filename = self.class.generate_filename(file) @filename = self.class.generate_filename(file)
super super
end end
......
...@@ -11,33 +11,34 @@ describe ProjectsController do ...@@ -11,33 +11,34 @@ describe ProjectsController do
describe "POST #upload_image" do describe "POST #upload_image" do
before do before do
sign_in(user) sign_in(user)
project.team << [user, :developer]
end end
context "without params['markdown_img']" do context "without params['markdown_img']" do
it "returns an error" do it "returns an error" do
post :upload_image, id: project.to_param post :upload_image, id: project.to_param, format: :json
expect(response.status).to eq(404) expect(response.status).to eq(422)
end end
end end
context "with invalid file" do context "with invalid file" do
before do before do
post :upload_image, id: project.to_param, markdown_img: @img post :upload_image, id: project.to_param, markdown_img: txt, format: :json
end end
it "returns an error" do it "returns an error" do
expect(response.status).to eq(404) expect(response.status).to eq(422)
end end
end end
context "with valid file" do context "with valid file" do
before do before do
post :upload_image, id: project.to_param, markdown_img: @img post :upload_image, id: project.to_param, markdown_img: jpg, format: :json
end end
it "returns a content with original filename and new link." do it "returns a content with original filename and new link." do
link = { alt: 'rails_sample', link: '' }.to_json expect(response.body).to match "\"alt\":\"rails_sample\""
expect(response.body).to have_content link expect(response.body).to match "\"url\":\"http://test.host/uploads/#{project.path_with_namespace}"
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment