From ee5e20a0b60398655861b2c730ccbbd948564aac Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 16 Feb 2016 19:21:12 +0100 Subject: [PATCH 1/6] Adds new links on popular section --- app/views/proposals/_popular.html.erb | 7 +++++-- config/locales/en.yml | 3 ++- config/locales/es.yml | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/proposals/_popular.html.erb b/app/views/proposals/_popular.html.erb index f8e3c61ac..5dea0fdbc 100644 --- a/app/views/proposals/_popular.html.erb +++ b/app/views/proposals/_popular.html.erb @@ -1,4 +1,7 @@

<%= t("proposals.index.top") %>

-
-<%= link_to t("proposals.index.top_link"), "/proposals/summary", class: "small" %> + +

+ <%= link_to t("proposals.index.top_link_proposals"), "/proposals/summary", class: "small" %>
+ <%= link_to t("proposals.index.top_link_debates"), "https://decide.madrid.es/debates?utf8=%E2%9C%93&search=%23T%C3%BAPreguntas&advanced_search%5Bdate_min%5D=2", class: "small" %>

+

diff --git a/config/locales/en.yml b/config/locales/en.yml index 0cdaa227c..a4fb210ef 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -302,7 +302,8 @@ en: start_proposal: Create a proposal title: Proposals top: Weekly selection - top_link: See the best proposals + top_link_debates: '#TúPreguntas' + top_link_proposals: The most supported proposals new: back_link: Go back form: diff --git a/config/locales/es.yml b/config/locales/es.yml index 59bfdc0df..50799576d 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -303,7 +303,8 @@ es: start_proposal: Crea una propuesta title: Propuestas ciudadanas top: Selección semanal - top_link: Ver las mejores propuestas + top_link_debates: '#TúPreguntas' + top_link_proposals: Propuestas más apoyadas new: back_link: Volver form: From 972bd6a8f01a6112956cef8a5e36176cbd730be8 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 16 Feb 2016 19:26:01 +0100 Subject: [PATCH 2/6] fixes specs --- spec/features/proposals_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index c8e9234dc..63644aa92 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1175,7 +1175,7 @@ feature 'Proposals' do create(:proposal, tag_list: 'Random') visit proposals_path - click_link "See the best proposals" + click_link "The most supported proposals" within("#culture") do expect(page).to have_content("Culture") From b81b560bd6c04ac431b1ba0ce779881e883d5f1e Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 17 Feb 2016 14:40:52 +0100 Subject: [PATCH 3/6] Deletes top debates link --- app/views/proposals/_popular.html.erb | 1 - config/locales/en.yml | 5 ++--- config/locales/es.yml | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/views/proposals/_popular.html.erb b/app/views/proposals/_popular.html.erb index 5dea0fdbc..7d9372943 100644 --- a/app/views/proposals/_popular.html.erb +++ b/app/views/proposals/_popular.html.erb @@ -3,5 +3,4 @@

<%= link_to t("proposals.index.top_link_proposals"), "/proposals/summary", class: "small" %>
- <%= link_to t("proposals.index.top_link_debates"), "https://decide.madrid.es/debates?utf8=%E2%9C%93&search=%23T%C3%BAPreguntas&advanced_search%5Bdate_min%5D=2", class: "small" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index a4fb210ef..3ffb66a39 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -301,9 +301,8 @@ en: select_order_long: 'You are viewing proposals according to:' start_proposal: Create a proposal title: Proposals - top: Weekly selection - top_link_debates: '#TúPreguntas' - top_link_proposals: The most supported proposals + top: Top weekly + top_link_proposals: The most supported proposals by category new: back_link: Go back form: diff --git a/config/locales/es.yml b/config/locales/es.yml index 50799576d..49b73472d 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -302,9 +302,8 @@ es: select_order_long: Estas viendo las propuestas start_proposal: Crea una propuesta title: Propuestas ciudadanas - top: Selección semanal - top_link_debates: '#TúPreguntas' - top_link_proposals: Propuestas más apoyadas + top: Top semanal + top_link_proposals: Propuestas más apoyadas por categoría new: back_link: Volver form: From ca39fdfdb584d5a34db1439086e97b7b3bab38cb Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 17 Feb 2016 14:44:37 +0100 Subject: [PATCH 4/6] Changes path for proposals summary --- app/views/proposals/_popular.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/proposals/_popular.html.erb b/app/views/proposals/_popular.html.erb index 7d9372943..15ef8dccf 100644 --- a/app/views/proposals/_popular.html.erb +++ b/app/views/proposals/_popular.html.erb @@ -2,5 +2,5 @@

<%= t("proposals.index.top") %>

- <%= link_to t("proposals.index.top_link_proposals"), "/proposals/summary", class: "small" %>
+ <%= link_to t("proposals.index.top_link_proposals"), summary_proposals_path, class: "small" %>

From c374e3f560c0993dc59c529b94ca005d10357f0a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 17 Feb 2016 15:22:12 +0100 Subject: [PATCH 5/6] Fixes specs --- spec/features/proposals_spec.rb | 2 +- spec/models/proposal_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 63644aa92..01c0a3724 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1175,7 +1175,7 @@ feature 'Proposals' do create(:proposal, tag_list: 'Random') visit proposals_path - click_link "The most supported proposals" + click_link "The most supported proposals by category" within("#culture") do expect(page).to have_content("Culture") diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 0f9b2f362..c5f529ad0 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -690,7 +690,7 @@ describe Proposal do proposal2 = create(:proposal, tag_list: 'Culture') proposal3 = create(:proposal, tag_list: 'Health') - expect(Proposal.for_summary).to include('Culture' => [proposal2, proposal1], 'Health' => [proposal3]) + expect(Proposal.for_summary).to include('Culture' => [proposal1, proposal2], 'Health' => [proposal3]) end end From afc2b5ffb818d2c8bb1216ade2497a57925566ac Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 17 Feb 2016 15:39:22 +0100 Subject: [PATCH 6/6] makes spec more robust --- spec/models/proposal_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index c5f529ad0..8d7492763 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -690,6 +690,9 @@ describe Proposal do proposal2 = create(:proposal, tag_list: 'Culture') proposal3 = create(:proposal, tag_list: 'Health') + proposal1.update_column(:confidence_score, 10) + proposal2.update_column(:confidence_score, 9) + expect(Proposal.for_summary).to include('Culture' => [proposal1, proposal2], 'Health' => [proposal3]) end end