From 6aa96c447185ea54e8709a8f455afe4ab87cd425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Wed, 7 Dec 2016 14:48:44 +0100 Subject: [PATCH] removes mentions to enquiries and deprecated code --- app/assets/stylesheets/participation.scss | 10 ----- app/views/enquiries/index.html.erb | 41 ------------------- .../proposals/_successful_banner.html.erb | 4 +- app/views/proposals/show.html.erb | 2 +- spec/features/admin/poll/questions_spec.rb | 2 +- spec/features/polls/questions_spec.rb | 4 +- spec/features/proposals_spec.rb | 2 +- spec/models/poll/partial_result_spec.rb | 2 +- 8 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 app/views/enquiries/index.html.erb diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index f03c76038..4f0b58bf7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1024,16 +1024,6 @@ } } -.enquiries-list { - - .enquiry { - background: white; - border-top: 1px solid $border; - padding: $line-height 0; - position: relative; - } -} - .successful { .panel { diff --git a/app/views/enquiries/index.html.erb b/app/views/enquiries/index.html.erb deleted file mode 100644 index 68e780cb5..000000000 --- a/app/views/enquiries/index.html.erb +++ /dev/null @@ -1,41 +0,0 @@ -
-
-
-

- <%= t("enquiries.index.title") %> -

-

- <%= t("enquiries.index.description_html").html_safe %> -

-
-
-
- -
-
-
- <%= render 'shared/filter_subnav', i18n_namespace: "enquiries.index" %> - - <% if @enquiries.present? %> -
- <% @enquiries.each do |enquiry| %> -
-

<%= link_to enquiry.title, enquiry %>

-
- <%= t('enquiries.index.dates', - open_at: l(enquiry.open_at.to_date), - closed_at: l(enquiry.closed_at.to_date)).html_safe %> -
-
- <% end %> -
- - <%= paginate @enquiries %> - <% else %> -
- <%= t("enquiries.index.no_enquiries_#{@current_filter}") %> -
- <% end %> -
-
-
diff --git a/app/views/proposals/_successful_banner.html.erb b/app/views/proposals/_successful_banner.html.erb index d593f5858..3bde0e097 100644 --- a/app/views/proposals/_successful_banner.html.erb +++ b/app/views/proposals/_successful_banner.html.erb @@ -2,8 +2,8 @@ <%= link_to polls_path do %>
-

<%= t("enquiries.banner.featured_title") %>

-

<%= t("enquiries.banner.info") %>

+

<%= t("poll_questions.banner.featured_title") %>

+

<%= t("poll_questions.banner.info") %>

<% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 87f09f1ac..ee89515a9 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -110,7 +110,7 @@

<% if can? :create, Poll::Question %>

- <%= link_to t('poll_questions.create_enquiry'), + <%= link_to t('poll_questions.create_question'), new_admin_question_path(proposal_id: @proposal.id), class: "button hollow expanded" %>

diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb index 84175f7fc..90e55107c 100644 --- a/spec/features/admin/poll/questions_spec.rb +++ b/spec/features/admin/poll/questions_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Admin enquiries' do +feature 'Admin poll questions' do background do login_as(create(:administrator).user) diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb index e55ffb05d..8e6574c5f 100644 --- a/spec/features/polls/questions_spec.rb +++ b/spec/features/polls/questions_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature 'Poll Questions' do - scenario 'Lists enquiries from proposals before regular enquiries' do + scenario 'Lists questions from proposals before regular questions' do poll = create(:poll) normal_question = create(:poll_question, poll: poll) proposal_question = create(:poll_question, proposal: create(:proposal), poll: poll) @@ -42,7 +42,7 @@ feature 'Poll Questions' do expect(page).to_not have_link('Chewbacca') end - scenario 'Level 2 users in an enquiry for a geozone which is not theirs' do + scenario 'Level 2 users in an poll question for a geozone which is not theirs' do question = create(:poll_question, geozone_ids: [], valid_answers: 'Vader, Palpatine') login_as(create(:user, :level_two)) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 67f6ae8f6..b8be8af12 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1531,7 +1531,7 @@ feature 'Successful proposals' do end end - scenario 'Successful proposals show create enquiry button to admin users' do + scenario 'Successful proposals show create question button to admin users' do successful_proposals = create_successful_proposals visit proposals_path diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb index 0b3fea411..1d203862b 100644 --- a/spec/models/poll/partial_result_spec.rb +++ b/spec/models/poll/partial_result_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe Poll::PartialResult do describe "validations" do - it "validates that the answers are included in the Enquiry's list" do + it "validates that the answers are included in the Poll::Question's list" do q = create(:poll_question, valid_answers: 'One, Two, Three') expect(build(:poll_partial_result, question: q, answer: 'One')).to be_valid expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid