+ <%= render partial: "featured_debate", collection: @featured_debates %>
+
+
+
+
+ <%= render @debates %>
-
-
-
+
+
+
+ + <%= pluralize(debate.comment_threads.count, t("debates.debate.comment"), t("debates.debate.comments")) %> +
+ <%= debate.description %> + <%= render "shared/tags", debate: debate %> +Por <%= debate.author.name %> el <%= l debate.created_at.to_date %>
-<%= sanitize(debate.description.html_safe) %>
+ -<%= render 'shared/tags', debate: debate %>
- -<%= pluralize(debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>
-+ <%= pluralize(featured_debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")) %> +
+<%= sanitize(truncate(featured_debate.description, length: 200).html_safe) %>
+<%= render "shared/tags", debate: featured_debate %>
+<%= render 'shared/tags', debate: @debate %>
-<%= render 'shared/tags', debate: @debate %>
+
<%= t("debates.show.comments") %>
-<%= t("debates.show.comments") %>
+<%= t("shared.tags_cloud.tags") %>
<% tag_cloud Debate.tag_counts, %w[s m l] do |tag, css_class| %> <%= link_to sanitize("#{tag.name}(#{tag.taggings_count})"), debates_path(tag: tag.name), class: css_class %> <% end %> -+
<%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %>
-<%= t("votes.supports") %>
+ +This is
' check 'debate_terms_of_service' click_button 'Create Debate' expect(page).to have_content 'Debate was successfully created.' expect(page).to have_content 'A test' - expect(page).to have_content 'This is alert("an attack");' + expect(page.html).to include 'This is alert("an attack");
' expect(page.html).to_not include '' + expect(page.html).to_not include '<p>This is' end scenario 'tagging using dangerous strings' do diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb index 6b5889ea7..46610632f 100644 --- a/spec/features/tags_spec.rb +++ b/spec/features/tags_spec.rb @@ -18,17 +18,19 @@ feature 'Tags' do end scenario 'Filtered' do - 2.times { create(:debate, tag_list: 'Salud') } - 2.times { create(:debate, tag_list: 'Hacienda') } + debate1 = create(:debate, tag_list: 'Salud') + debate2 = create(:debate, tag_list: 'Salud') + debate3 = create(:debate, tag_list: 'Hacienda') + debate4 = create(:debate, tag_list: 'Hacienda') visit debates_path first(:link, "Salud").click - within('#debates') do - expect(page).to have_css('.debate', count: 2) - expect(page).to have_content('Salud') - expect(page).to_not have_content('Hacienda') - end + expect(page).to have_css('.debate', count: 2) + expect(page).to have_content(debate1.title) + expect(page).to have_content(debate2.title) + expect(page).to_not have_content(debate3.title) + expect(page).to_not have_content(debate4.title) end scenario 'Show' do diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index f2af2cf0a..00f6217bd 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -20,15 +20,22 @@ describe Debate do expect(@debate).to_not be_valid end - it "should not be valid without a description" do - @debate.description = nil - expect(@debate).to_not be_valid - end + describe "#description" do + it "should be mandatory" do + @debate.description = nil + expect(@debate).to_not be_valid + end - it "should sanitize the description" do - @debate.description = "" - @debate.valid? - expect(@debate.description).to eq("alert('danger');") + it "should be sanitized" do + @debate.description = "" + @debate.valid? + expect(@debate.description).to eq("alert('danger');") + end + + it "should be html_safe" do + @debate.description = "" + expect(@debate.description).to be_html_safe + end end it "should sanitize the tag list" do