Merge branch 'extend_markdown_upload' into 'master'

Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530

2 files changed, 57 insertions, 38 deletions

diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
new file mode 100644
index 00000000000..029f48b2d7a
--- /dev/null
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -0,0 +1,57 @@
+require('spec_helper')
+
+describe Projects::UploadsController do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+  let(:jpg)     { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
+  let(:txt)     { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+
+  describe "POST #create" do
+    before do
+      sign_in(user)
+      project.team << [user, :developer]
+    end
+
+    context "without params['file']" do
+      it "returns an error" do
+        post :create, 
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param, 
+          format: :json
+        expect(response.status).to eq(422)
+      end
+    end
+
+    context 'with valid image' do
+      before do
+        post :create,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          file: jpg,
+          format: :json
+      end
+
+      it 'returns a content with original filename, new link, and correct type.' do
+        expect(response.body).to match '\"alt\":\"rails_sample\"'
+        expect(response.body).to match "\"url\":\"http://localhost/#{project.path_with_namespace}/uploads"
+        expect(response.body).to match '\"is_image\":true'
+      end
+    end
+
+    context 'with valid non-image file' do
+      before do
+        post :create, 
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param, 
+          file: txt, 
+          format: :json
+      end
+
+      it 'returns a content with original filename, new link, and correct type.' do
+        expect(response.body).to match '\"alt\":\"doc_sample.txt\"'
+        expect(response.body).to match "\"url\":\"http://localhost/#{project.path_with_namespace}/uploads"
+        expect(response.body).to match '\"is_image\":false'
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 06c703ecf7a..89bb35de8fc 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -7,44 +7,6 @@ describe ProjectsController do
   let(:jpg)     { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
   let(:txt)     { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
 
-  describe "POST #upload_image" do
-    before do
-      sign_in(user)
-      project.team << [user, :developer]
-    end
-
-    context "without params['markdown_img']" do
-      it "returns an error" do
-        post(:upload_image, namespace_id: project.namespace.to_param,
-             id: project.to_param, format: :json)
-        expect(response.status).to eq(422)
-      end
-    end
-
-    context "with invalid file" do
-      before do
-        post(:upload_image, namespace_id: project.namespace.to_param,
-             id: project.to_param, markdown_img: txt, format: :json)
-      end
-
-      it "returns an error" do
-        expect(response.status).to eq(422)
-      end
-    end
-
-    context "with valid file" do
-      before do
-        post(:upload_image, namespace_id: project.namespace.to_param,
-             id: project.to_param, markdown_img: jpg, format: :json)
-      end
-
-      it "returns a content with original filename and new link." do
-        expect(response.body).to match "\"alt\":\"rails_sample\""
-        expect(response.body).to match "\"url\":\"http://test.host/uploads/#{project.path_with_namespace}"
-      end
-    end
-  end
-
   describe "POST #toggle_star" do
     it "toggles star if user is signed in" do
       sign_in(user)