-
dev.to is where software developers read, write, and level up.
-
Sign Up Now
-
-
(open source and free forever ❤️)
-
<%= f.label :published %>
<%= f.check_box :published %>
- <%= f.label :target_tag %>
- <%= f.text_field :target_tag, placeholder: 'One tag, e.g. javascript. Optional targeting.' %>
+ <%= f.label :group %>
+ <%= f.select(:group, options_for_select(["article_show_sidebar_cta", "article_show_below_article_cta"], @html_variant.group || "article_show_sidebar_cta")) %>
<%= f.submit %>
<% end %>
<% if @html_variant.html.present? %>
+
<%= @html_variant.html.html_safe %>
+ <% if @html_variant.group == "article_show_below_article_cta" %>
+
+ <%= @html_variant.html.html_safe %>
+
+ <% end %>
+
<% end %>
\ No newline at end of file
diff --git a/app/views/html_variants/_page_styles.html.erb b/app/views/html_variants/_page_styles.html.erb
index 542a9096a..fe2fa3c09 100644
--- a/app/views/html_variants/_page_styles.html.erb
+++ b/app/views/html_variants/_page_styles.html.erb
@@ -68,11 +68,14 @@
border-radius: 3px;
margin: 15px;
width: 450px;
- height: 550px;
+ height: 620px;
float: left;
overflow: hidden;
position: relative;
}
+ .html-variants-page-single-big {
+ width: 962px;
+ }
.html-variants-page-single-variant h3 {
margin-top: 0px;
font-size:1.3em;
@@ -82,6 +85,10 @@
border: 0px;
width: 310px;
height: 350px;
+ border: 1px solid #888888;
+ }
+ .html-variants-page-single-big iframe {
+ width: 800px;
}
.html-variants-page-single-variant-details {
padding: 10px;
diff --git a/app/views/html_variants/_single_html_variant.html.erb b/app/views/html_variants/_single_html_variant.html.erb
index df961d9be..0611d6f31 100644
--- a/app/views/html_variants/_single_html_variant.html.erb
+++ b/app/views/html_variants/_single_html_variant.html.erb
@@ -1,7 +1,7 @@
-
- @<%= html_variant.user.username %>:
+
">
+ <%= html_variant.group %> | @<%= html_variant.user.username %>:
diff --git a/app/views/html_variants/index.html.erb b/app/views/html_variants/index.html.erb
index 1adc36b47..6c439b93a 100644
--- a/app/views/html_variants/index.html.erb
+++ b/app/views/html_variants/index.html.erb
@@ -20,3 +20,4 @@
<% end %>
+ <%= paginate @html_variants %>
diff --git a/app/views/html_variants/show.html.erb b/app/views/html_variants/show.html.erb
index 3da7cc719..91f4ec2ed 100644
--- a/app/views/html_variants/show.html.erb
+++ b/app/views/html_variants/show.html.erb
@@ -1,9 +1,22 @@
+
<%= render "layouts/styles" %>
-
-
- <%= @html_variant.html.html_safe %>
+<% if @html_variant.group == "article_show_below_article_cta" %>
+
+
+ <%= @html_variant.html.html_safe %>
+
-
\ No newline at end of file
+<% else %>
+
+
+ <%= @html_variant.html.html_safe %>
+
+
+<% end %>
\ No newline at end of file
diff --git a/spec/requests/html_variants_spec.rb b/spec/requests/html_variants_spec.rb
index b37e728a2..4f28f61fe 100644
--- a/spec/requests/html_variants_spec.rb
+++ b/spec/requests/html_variants_spec.rb
@@ -57,7 +57,8 @@ RSpec.describe "HtmlVariants", type: :request do
html_variant: {
name: "New post",
html: "Yo ho ho#{rand(100)}", tag_list: "yoyo",
- published: true
+ published: true,
+ group: "article_show_sidebar_cta"
}
}
expect(HtmlVariant.all.size).to eq(1)
@@ -72,7 +73,7 @@ RSpec.describe "HtmlVariants", type: :request do
published: true
}
}
- expect(HtmlVariant.all.size).to eq(1)
+ expect(HtmlVariant.all.size).to eq(0)
end
end
diff --git a/spec/requests/stories_show_spec.rb b/spec/requests/stories_show_spec.rb
index d64520795..6de7deccf 100644
--- a/spec/requests/stories_show_spec.rb
+++ b/spec/requests/stories_show_spec.rb
@@ -31,22 +31,51 @@ RSpec.describe "StoriesShow", type: :request do
expect(response.body).to include "
with "
end
+ # sidebar HTML variant
it "renders html variant" do
html_variant = create(:html_variant, published: true, approved: true)
- get article.path
+ get article.path + "?variant_version=1"
expect(response.body).to include html_variant.html
end
it "Does not render variant when no variants published" do
html_variant = create(:html_variant, published: false, approved: true)
- get article.path
+ get article.path + "?variant_version=1"
expect(response.body).not_to include html_variant.html
end
it "does not render html variant when user logged in" do
html_variant = create(:html_variant, published: true, approved: true)
sign_in user
- get article.path
+ get article.path + "?variant_version=1"
+ expect(response.body).not_to include html_variant.html
+ end
+
+ # Below article HTML variant
+ it "renders below article html variant" do
+ html_variant = create(:html_variant, published: true, approved: true, group: "article_show_below_article_cta")
+ article.update_column(:body_markdown, rand(36**1000).to_s(36).to_s) # min length for article
+ get article.path + "?variant_version=0"
+ expect(response.body).to include html_variant.html
+ end
+
+ it "Does not render below article html variant for short article" do
+ html_variant = create(:html_variant, published: true, approved: true, group: "article_show_below_article_cta")
+ article.update_column(:body_markdown, rand(36**100).to_s(36).to_s) # ensure too short
+ get article.path + "?variant_version=0"
+ expect(response.body).not_to include html_variant.html
+ end
+
+ it "Does not render below article variant when no variants published" do
+ html_variant = create(:html_variant, published: false, approved: true, group: "article_show_below_article_cta")
+ get article.path + "?variant_version=0"
+ expect(response.body).not_to include html_variant.html
+ end
+
+ it "does not render below article html variant when user logged in" do
+ html_variant = create(:html_variant, published: true, approved: true, group: "article_show_below_article_cta")
+ sign_in user
+ get article.path + "?variant_version=0"
expect(response.body).not_to include html_variant.html
end