diff options
author | Robert Speicher <robert@gitlab.com> | 2016-01-08 20:29:43 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-01-08 20:29:43 +0000 |
commit | af68897acda31a55093e2b5fdd7eba61e54b404c (patch) | |
tree | de423ec8ff971b5f2c42cb6810259d2fab82da67 /spec/lib | |
parent | 6467448a1aaaa216560d35f2bd0ac4f8932f77ec (diff) | |
parent | 0614793b38db4711053cbcb4fa80d9c8cc492eec (diff) | |
download | gitlab-ce-af68897acda31a55093e2b5fdd7eba61e54b404c.tar.gz |
Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317
See merge request !2329
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/email/receiver_spec.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb index b535413bbd4..abe179cd4af 100644 --- a/spec/lib/gitlab/email/receiver_spec.rb +++ b/spec/lib/gitlab/email/receiver_spec.rb @@ -42,7 +42,7 @@ describe Gitlab::Email::Receiver, lib: true do context "when the email was auto generated" do let!(:reply_key) { '636ca428858779856c226bb145ef4fad' } let!(:email_raw) { fixture_file("emails/auto_reply.eml") } - + it "raises an AutoGeneratedEmailError" do expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::AutoGeneratedEmailError) end @@ -90,7 +90,7 @@ describe Gitlab::Email::Receiver, lib: true do context "when the reply is blank" do let!(:email_raw) { fixture_file("emails/no_content_reply.eml") } - + it "raises an EmptyEmailError" do expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::EmptyEmailError) end @@ -107,13 +107,16 @@ describe Gitlab::Email::Receiver, lib: true do end context "when everything is fine" do + let(:markdown) { "![image](uploads/image.png)" } + before do allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return( [ { url: "uploads/image.png", is_image: true, - alt: "image" + alt: "image", + markdown: markdown } ] ) @@ -132,7 +135,7 @@ describe Gitlab::Email::Receiver, lib: true do note = noteable.notes.last - expect(note.note).to include("![image](uploads/image.png)") + expect(note.note).to include(markdown) end end end |