summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorEarle Bunao & Neil Calabroso <earle.bunao@gmail.com & nmcalabroso@gmail.com>2014-05-23 16:22:00 +0800
committererbunao <earle.bunao@gmail.com>2014-05-23 16:22:42 +0800
commit6a85cdf1627629ecaa762fa60a7abdbd092cc20a (patch)
treeada8c5565fa6e336b3074b4e606273029c473d0a /spec/controllers
parent696b9903f08011e37811dc8b8ff4f7da77201d13 (diff)
downloadgitlab-ce-6a85cdf1627629ecaa762fa60a7abdbd092cc20a.tar.gz
Implements drag and drop upload in creating issues
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/commits_controller_spec.rb3
-rw-r--r--spec/controllers/projects_controller_spec.rb44
2 files changed, 45 insertions, 2 deletions
diff --git a/spec/controllers/commits_controller_spec.rb b/spec/controllers/commits_controller_spec.rb
index fbf4f29acfd..308cfa69219 100644
--- a/spec/controllers/commits_controller_spec.rb
+++ b/spec/controllers/commits_controller_spec.rb
@@ -6,8 +6,7 @@ describe Projects::CommitsController do
before do
sign_in(user)
-
- project.team << [user, :master]
+ project.creator = user
end
describe "GET show" do
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
new file mode 100644
index 00000000000..07ca8d25026
--- /dev/null
+++ b/spec/controllers/projects_controller_spec.rb
@@ -0,0 +1,44 @@
+require('spec_helper')
+
+describe ProjectsController do
+ let(:project) { create(:project) }
+ let(:user) { create(:user) }
+ let(:png) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
+ let(:jpg) { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
+ let(:gif) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+ let(:txt) { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+
+ describe "POST #upload_image" do
+ before do
+ sign_in(user)
+ end
+
+ context "without params['markdown_img']" do
+ it "returns an error" do
+ post :upload_image, id: project.to_param
+ expect(response.status).to eq(404)
+ end
+ end
+
+ context "with invalid file" do
+ before do
+ post :upload_image, id: project.to_param, markdown_img: @img
+ end
+
+ it "returns an error" do
+ expect(response.status).to eq(404)
+ end
+ end
+
+ context "with valid file" do
+ before do
+ post :upload_image, id: project.to_param, markdown_img: @img
+ end
+
+ it "returns a content with original filename and new link." do
+ link = { alt: 'rails_sample', link: '' }.to_json
+ expect(response.body).to have_content link
+ end
+ end
+ end
+end \ No newline at end of file