Commit 1e927d39 authored by Douwe Maan's avatar Douwe Maan

Update spec

parent 706d7eb0
...@@ -443,6 +443,10 @@ GEM ...@@ -443,6 +443,10 @@ GEM
omniauth (1.2.2) omniauth (1.2.2)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
rack (~> 1.0) rack (~> 1.0)
omniauth-azure-oauth2 (0.0.6)
jwt (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-bitbucket (0.0.2) omniauth-bitbucket (0.0.2)
multi_json (~> 1.7) multi_json (~> 1.7)
omniauth (~> 1.1) omniauth (~> 1.1)
...@@ -488,10 +492,6 @@ GEM ...@@ -488,10 +492,6 @@ GEM
activesupport activesupport
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-azure-oauth2 (0.0.6)
jwt (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
opennebula (4.14.2) opennebula (4.14.2)
json json
nokogiri nokogiri
...@@ -920,6 +920,7 @@ DEPENDENCIES ...@@ -920,6 +920,7 @@ DEPENDENCIES
oauth2 (~> 1.0.0) oauth2 (~> 1.0.0)
octokit (~> 3.7.0) octokit (~> 3.7.0)
omniauth (~> 1.2.2) omniauth (~> 1.2.2)
omniauth-azure-oauth2
omniauth-bitbucket (~> 0.0.2) omniauth-bitbucket (~> 0.0.2)
omniauth-cas3 (~> 1.1.2) omniauth-cas3 (~> 1.1.2)
omniauth-facebook (~> 3.0.0) omniauth-facebook (~> 3.0.0)
...@@ -931,7 +932,6 @@ DEPENDENCIES ...@@ -931,7 +932,6 @@ DEPENDENCIES
omniauth-shibboleth (~> 1.2.0) omniauth-shibboleth (~> 1.2.0)
omniauth-twitter (~> 1.2.0) omniauth-twitter (~> 1.2.0)
omniauth_crowd omniauth_crowd
omniauth-azure-oauth2
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
paranoia (~> 2.0) paranoia (~> 2.0)
pg (~> 0.18.2) pg (~> 0.18.2)
......
...@@ -107,13 +107,16 @@ describe Gitlab::Email::Receiver, lib: true do ...@@ -107,13 +107,16 @@ describe Gitlab::Email::Receiver, lib: true do
end end
context "when everything is fine" do context "when everything is fine" do
let(:markdown) { "![image](uploads/image.png)" }
before do before do
allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return( allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return(
[ [
{ {
url: "uploads/image.png", url: "uploads/image.png",
is_image: true, is_image: true,
alt: "image" alt: "image",
markdown: markdown
} }
] ]
) )
...@@ -132,7 +135,7 @@ describe Gitlab::Email::Receiver, lib: true do ...@@ -132,7 +135,7 @@ describe Gitlab::Email::Receiver, lib: true do
note = noteable.notes.last note = noteable.notes.last
expect(note.note).to include("![image](uploads/image.png)") expect(note.note).to include(markdown)
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