Skip to content

Commit

Permalink
Merge 6aaf427 into 516edd4
Browse files Browse the repository at this point in the history
  • Loading branch information
towanda committed Nov 15, 2017
2 parents 516edd4 + 6aaf427 commit f827659
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 15 deletions.
3 changes: 2 additions & 1 deletion lib/article_json/export/common/html/elements/embed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ def export
private

def embed_node
create_element(:div, class: 'embed') do |div|
type = @element.embed_type || :type
create_element(:div, class: "embed #{type}") do |div|
div.add_child(embedded_object)
end
end
Expand Down
12 changes: 6 additions & 6 deletions spec/article_json/export/amp/elements/embed_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
context 'with a youtube video' do
let(:source_element_embed_type) { :youtube_video }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed youtube_video">' \
'<amp-youtube data-videoid="666" width="560" height="315">' \
'</amp-youtube></div>' \
'<figcaption>Foo Bar</figcaption></figure>'
Expand All @@ -30,7 +30,7 @@
context 'with a vimeo video' do
let(:source_element_embed_type) { :vimeo_video }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed vimeo_video">' \
'<amp-vimeo data-videoid="666" width="560" height="315">' \
'</amp-vimeo></div>' \
'<figcaption>Foo Bar</figcaption></figure>'
Expand All @@ -43,7 +43,7 @@
let(:url) { 'facebook.com/facebook/videos/666' }
let(:source_element_embed_type) { :facebook_video }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed facebook_video">' \
'<amp-facebook ' \
'data-embedded-as="video" ' \
'data-href="https://www.facebook.com/Devex/videos/666" ' \
Expand All @@ -69,7 +69,7 @@
let(:source_element_embed_type) { :tweet }
let(:source_element_embed_id) { 'myTwitterAccount/1234' }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed tweet">' \
'<amp-twitter data-tweetid="1234" width="560" height="315">' \
'</amp-twitter></div>' \
'<figcaption>Foo Bar</figcaption></figure>'
Expand All @@ -81,7 +81,7 @@
context 'with a slideshare presentation' do
let(:source_element_embed_type) { :slideshare }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed slideshare">' \
'<amp-iframe ' \
'src="https://www.slideshare.net/slideshow/embed_code/key/fAYvedL9rNCr9k"' \
' width="427" height="356" frameborder="0">' \
Expand All @@ -105,7 +105,7 @@
let(:source_element_embed_type) { :youtube_video }
let(:caption) { [] }
let(:expected_html) do
'<figure><div class="embed">' \
'<figure><div class="embed youtube_video">' \
'<amp-youtube data-videoid="666" width="560" height="315">' \
'</amp-youtube></div></figure>'
end
Expand Down
2 changes: 1 addition & 1 deletion spec/article_json/export/html/elements/base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
)
end
let(:expected_html) do
'<figure><div class="embed">Embedded Object: something-666</div>' \
'<figure><div class="embed something">Embedded Object: something-666</div>' \
'<figcaption>Foo Bar</figcaption></figure>'
end
let(:oembed_data) { { html: 'Embedded Object: something-666' } }
Expand Down
31 changes: 28 additions & 3 deletions spec/article_json/export/html/elements/embed_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
context 'when the endpoint successfully returns OEmbed data' do
context 'with a proper caption' do
let(:expected_html) do
'<figure><div class="embed">Embedded Object: something-666</div>' \
'<figure><div class="embed something">' \
'Embedded Object: something-666</div>' \
'<figcaption>Foo Bar</figcaption></figure>'
end
it { should eq expected_html }
Expand All @@ -31,7 +32,30 @@
context 'without a proper caption' do
let(:caption) { [] }
let(:expected_html) do
'<figure><div class="embed">Embedded Object: something-666</div>' \
'<figure><div class="embed something">' \
'Embedded Object: something-666</div>' \
'</figure>'
end
it { should eq expected_html }
end

context 'when it is a facebook video' do
let(:embed_type) { :facebook_video }
let(:caption) { [] }
let(:expected_html) do
'<figure><div class="embed facebook_video">' \
'Embedded Object: something-666</div>' \
'</figure>'
end
it { should eq expected_html }
end

context 'when it is a vimeo video' do
let(:embed_type) { :vimeo_video }
let(:caption) { [] }
let(:expected_html) do
'<figure><div class="embed vimeo_video">' \
'Embedded Object: something-666</div>' \
'</figure>'
end
it { should eq expected_html }
Expand All @@ -41,7 +65,8 @@
context 'when the endpoint does not return OEmbed data' do
let(:embed_type) { :youtube_video }
let(:expected_html) do
'<figure><div class="embed"><span class="unavailable-embed">'\
'<figure><div class="embed youtube_video">' \
'<span class="unavailable-embed">'\
'The Youtube video <a href="https://www.youtube.com/watch?v=666">'\
'https://www.youtube.com/watch?v=666</a> is not available.</span>'\
'</div><figcaption>Foo Bar</figcaption></figure>'
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/reference_document_exported.amp.html

Large diffs are not rendered by default.

Loading

0 comments on commit f827659

Please sign in to comment.