summaryrefslogtreecommitdiff
path: root/spec/controllers/projects_controller_spec.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-05-26 14:17:46 +0200
committerMarin Jankovski <marin@gitlab.com>2014-05-26 14:17:46 +0200
commit8bec6b0bcb100b30a43fcd9c6649d1bee113b6a7 (patch)
tree6aef03a4d7da1220721a3d5d7550ac8d2212c227 /spec/controllers/projects_controller_spec.rb
parent2a8aa7429b6f489acd07c99e2e33a09c21c2ba01 (diff)
downloadgitlab-ce-8bec6b0bcb100b30a43fcd9c6649d1bee113b6a7.tar.gz
Make existing tests test something, return correct errors.
Diffstat (limited to 'spec/controllers/projects_controller_spec.rb')
-rw-r--r--spec/controllers/projects_controller_spec.rb17
1 files changed, 9 insertions, 8 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 07ca8d25026..1d465d4996e 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -11,34 +11,35 @@ describe ProjectsController do
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, id: project.to_param
- expect(response.status).to eq(404)
+ post :upload_image, id: project.to_param, format: :json
+ expect(response.status).to eq(422)
end
end
context "with invalid file" 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
it "returns an error" do
- expect(response.status).to eq(404)
+ expect(response.status).to eq(422)
end
end
context "with valid file" 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
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
+ 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
-end \ No newline at end of file
+end