+
+
-
<%= t("proposals.proposal.created") %>
+
<%= t("proposals.proposal.created") %>
-
- <%= t("proposals.proposal.share.guide") %>
- <%= t("proposals.proposal.share.edit") %>
-
+
+ <%= t("proposals.proposal.share.guide") %>
+ <%= t("proposals.proposal.share.edit") %>
+
- <%= render "shared/social_share",
- title: @proposal.title,
- url: proposal_url(@proposal),
- description: @proposal.summary,
- mobile: @proposal.title %>
+ <%= render "shared/social_share",
+ title: @proposal.title,
+ url: proposal_url(@proposal),
+ description: @proposal.summary,
+ mobile: @proposal.title %>
- <% if can?(:dashboard, @proposal) %>
-
-
- <%= t("proposals.share.improve_it") %>
-
-
- <%= link_to t("proposals.share.dashboard"),
- progress_proposal_dashboard_path(@proposal), class: "button expanded" %>
-
-
- <% end %>
-
-
- <%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %>
-
-
-
-
-
-
- <%= @proposal.title %>
- <%= t("proposals.show.code") %> <%= @proposal.code %>
+ <% if can?(:dashboard, @proposal) %>
+
+
+ <%= t("proposals.share.improve_it") %>
+
+ <%= link_to t("proposals.share.dashboard"),
+ progress_proposal_dashboard_path(@proposal), class: "button expanded" %>
+
+ <% end %>
+
+
+ <%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %>
+
+
+
+
+
+
+ <%= @proposal.title %>
+ <%= t("proposals.show.code") %> <%= @proposal.code %>
+
diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb
index 27b8f63c2..ed3cf1f82 100644
--- a/app/views/shared/_social_share.html.erb
+++ b/app/views/shared/_social_share.html.erb
@@ -1,7 +1,5 @@
<% description = local_assigns.fetch(:description, "") %>
<% description = truncate(ActionView::Base.full_sanitizer.sanitize(description), length: 140) %>
-<% mobile = local_assigns[:mobile] %>
-<% mobile_url = mobile.present? ? "#{mobile.gsub(/\s+/, "%20")}%20" : "" %>
<% if local_assigns[:share_title].present? %>
@@ -13,10 +11,6 @@
image: local_assigns.fetch(:image_url, ""),
desc: description,
"data-twitter-title": local_assigns[:mobile],
- "data-telegram-title": local_assigns[:mobile]) %>
-
-
- <%= t("social.whatsapp") %>
-
+ "data-telegram-title": local_assigns[:mobile],
+ "data-whatsapp_app-title": local_assigns[:mobile]) %>
diff --git a/config/initializers/social_share_button.rb b/config/initializers/social_share_button.rb
index 48840aeac..0d76f9dac 100644
--- a/config/initializers/social_share_button.rb
+++ b/config/initializers/social_share_button.rb
@@ -1,3 +1,3 @@
SocialShareButton.configure do |config|
- config.allow_sites = %w[twitter facebook telegram]
+ config.allow_sites = %w[twitter facebook telegram whatsapp_app]
end
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 3985effb9..6f6672013 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -784,7 +784,6 @@ en:
facebook: "%{org} Facebook"
twitter: "%{org} Twitter"
youtube: "%{org} YouTube"
- whatsapp: WhatsApp
telegram: "%{org} Telegram"
instagram: "%{org} Instagram"
stats:
diff --git a/config/locales/en/social_share_button.yml b/config/locales/en/social_share_button.yml
index dbc62e956..3cddf1c1c 100644
--- a/config/locales/en/social_share_button.yml
+++ b/config/locales/en/social_share_button.yml
@@ -16,4 +16,5 @@ en:
plurk: "Plurk"
pinterest: "Pinterest"
email: "Email"
- telegram: "Telegram"
\ No newline at end of file
+ telegram: "Telegram"
+ whatsapp_app: "WhatsApp"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 9b0e15134..d1fff5341 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -784,7 +784,6 @@ es:
facebook: "Facebook de %{org}"
twitter: "Twitter de %{org}"
youtube: "YouTube de %{org}"
- whatsapp: WhatsApp
telegram: "Telegram de %{org}"
instagram: "Instagram de %{org}"
stats:
diff --git a/config/locales/es/social_share_button.yml b/config/locales/es/social_share_button.yml
index 2947efcc6..4749ced24 100644
--- a/config/locales/es/social_share_button.yml
+++ b/config/locales/es/social_share_button.yml
@@ -17,3 +17,4 @@ es:
pinterest: "Pinterest"
email: "Correo electrónico"
telegram: "Telegram"
+ whatsapp_app: "WhatsApp"
diff --git a/spec/system/debates_spec.rb b/spec/system/debates_spec.rb
index 6e052681e..7dd5d4cdb 100644
--- a/spec/system/debates_spec.rb
+++ b/spec/system/debates_spec.rb
@@ -93,9 +93,43 @@ describe "Debates" do
expect(page).to have_content I18n.l(debate.created_at.to_date)
expect(page).to have_selector(avatar(debate.author.name))
expect(page.html).to include "
#{debate.title}"
+ end
- within(".social-share-button") do
- expect(page.all("a").count).to be(3) # Twitter, Facebook, Telegram
+ describe "Social share buttons", :js do
+ context "On desktop browsers" do
+ scenario "Shows links to share on facebook and twitter" do
+ visit debate_path(create(:debate))
+
+ within(".social-share-button") do
+ expect(page.all("a").count).to be(2)
+ expect(page).to have_link "Share to Facebook"
+ expect(page).to have_link "Share to Twitter"
+ end
+ end
+ end
+
+ context "On small devices" do
+ let!(:window_size) { Capybara.current_window.size }
+
+ before do
+ Capybara.current_window.resize_to(639, 479)
+ end
+
+ after do
+ Capybara.current_window.resize_to(*window_size)
+ end
+
+ scenario "Shows links to share on telegram and whatsapp too" do
+ visit debate_path(create(:debate))
+
+ within(".social-share-button") do
+ expect(page.all("a").count).to be(4)
+ expect(page).to have_link "Share to Facebook"
+ expect(page).to have_link "Share to Twitter"
+ expect(page).to have_link "Share to Telegram"
+ expect(page).to have_link "Share to WhatsApp"
+ end
+ end
end
end
diff --git a/spec/system/proposals_spec.rb b/spec/system/proposals_spec.rb
index 31f2d13a5..e6afeab3d 100644
--- a/spec/system/proposals_spec.rb
+++ b/spec/system/proposals_spec.rb
@@ -138,9 +138,43 @@ describe "Proposals" do
expect(page.html).to include "
#{proposal.title}"
expect(page).not_to have_selector ".js-flag-actions"
expect(page).not_to have_selector ".js-follow"
+ end
- within(".social-share-button") do
- expect(page.all("a").count).to be(3) # Twitter, Facebook, Telegram
+ describe "Social share buttons", :js do
+ context "On desktop browsers" do
+ scenario "Shows links to share on facebook and twitter" do
+ visit proposal_path(create(:proposal))
+
+ within(".social-share-button") do
+ expect(page.all("a").count).to be(2)
+ expect(page).to have_link "Share to Facebook"
+ expect(page).to have_link "Share to Twitter"
+ end
+ end
+ end
+
+ context "On small devices" do
+ let!(:window_size) { Capybara.current_window.size }
+
+ before do
+ Capybara.current_window.resize_to(639, 479)
+ end
+
+ after do
+ Capybara.current_window.resize_to(*window_size)
+ end
+
+ scenario "Shows links to share on telegram and whatsapp too" do
+ visit proposal_path(create(:proposal))
+
+ within(".social-share-button") do
+ expect(page.all("a").count).to be(4)
+ expect(page).to have_link "Share to Facebook"
+ expect(page).to have_link "Share to Twitter"
+ expect(page).to have_link "Share to Telegram"
+ expect(page).to have_link "Share to WhatsApp"
+ end
+ end
end
end