Merge pull request #1368 from consul/polls-question-show

Polls question show

app/views/polls/questions/show.html.erb

@@ -46,9 +46,23 @@
 
 <div class="row margin-top">
   <div class="small-12 column">
-    <% if @question.poll.current? %>
+    <% if can? :answer, @question %>
-
+      <div class="text-center">
-      <% if current_user.nil? %>
+        <%= link_to t('poll_questions.show.answer_this_question'),
+              @question.poll,
+              class: 'large button'
+        %>
+      </div>
+    <% else %>
+      <% if @question.poll.incoming? %>
+        <div class="callout alert">
+          <%= t('poll_questions.show.cant_answer_incoming') %>
+        </div>
+      <% elsif @question.poll.expired? %>
+        <div class="callout primary">
+          <%= t('poll_questions.show.cant_answer_expired') %>
+        </div>
+      <% elsif current_user.nil? %>
         <div class="callout primary">
           <%= t("poll_questions.show.not_logged_in",
               signin: link_to(t("poll_questions.show.signin"), new_user_session_path, class: "probe-message"),
@@ -70,15 +84,6 @@
           <%= render "answers", question: @question %>
         </div>
       </div>
-
-    <% elsif @question.poll.incoming? %>
-      <div class="callout alert">
-        <%= t('poll_questions.show.cant_answer_expired') %>
-      </div>
-    <% elsif @question.poll.expired? %>
-      <div class="callout primary">
-        <%= t('poll_questions.show.cant_answer_incoming') %>
-      </div>
     <% end %>
   </div>
 </div>

config/locales/en.yml

@@ -416,6 +416,7 @@ en:
     create_question: "Create question"
     default_valid_answers: "Yes, No"
     show:
+      answer_this_question: "Answer this question"
       original_proposal: "Original proposal"
       author: "Created by"
       dates_title: "Participation dates"

config/locales/es.yml

@@ -416,6 +416,7 @@ es:
     create_question: "Crear pregunta para votación"
     default_valid_answers: "Sí, No"
     show:
+      answer_this_question: "Responder a esta pregunta"
       original_proposal: "Propuesta original"
       author: "Creado por"
       dates_title: "Fechas de participación"

db/dev_seeds.rb

@@ -467,7 +467,14 @@ end
 puts "Creating polls"
 
 puts "Active Polls"
-(1..5).each do |i|
+(1..3).each do |i|
+  poll = Poll.create(name: "Active Poll #{i}",
+                     starts_at: 1.month.ago,
+                     ends_at:   1.month.from_now,
+                     geozone_restricted: false)
+  puts "    #{poll.name}"
+end
+(4..5).each do |i|
   poll = Poll.create(name: "Active Poll #{i}",
                      starts_at: 1.month.ago,
                      ends_at:   1.month.from_now,
@@ -477,6 +484,10 @@ puts "Active Polls"
   puts "    #{poll.name}"
 end
 
+
+
+
+
 puts "Upcoming Poll"
 poll = Poll.create(name: "Upcoming Poll",
                    starts_at: 1.month.from_now,

spec/features/polls/questions_spec.rb

@@ -62,8 +62,7 @@ feature 'Poll Questions' do
       login_as(create(:user, :level_two, geozone: geozone))
       visit question_path(question)
 
-      expect(page).to have_link('Han Solo')
+      expect(page).to have_link('Answer this question')
-      expect(page).to have_link('Chewbacca')
     end
 
     scenario 'Level 2 users who have already answered' do
@@ -75,9 +74,7 @@ feature 'Poll Questions' do
       login_as user
       visit question_path(question)
 
-      expect(page).to have_link('Han Solo')
+      expect(page).to have_link('Answer this question')
-      expect(page).to_not have_link('Chewbacca')
-      expect(page).to have_content('Chewbacca')
     end
 
     scenario 'Level 2 users answering', :js do
@@ -87,10 +84,7 @@ feature 'Poll Questions' do
       login_as user
       visit question_path(question)
 
-      click_link 'Han Solo'
+      expect(page).to have_link('Answer this question')
-
-      expect(page).to_not have_link('Han Solo')
-      expect(page).to have_link('Chewbacca')
     end
 
     scenario 'Records participarion', :js do
@@ -100,6 +94,7 @@ feature 'Poll Questions' do
       login_as user
       visit question_path(question)
 
+      click_link 'Answer this question'
       click_link 'Han Solo'
 
       expect(page).to_not have_link('Han Solo')