From 235b4314a467f3351b859262175d7174c7d3967e Mon Sep 17 00:00:00 2001
From: Mark Moser <mark.moser@perficient.com>
Date: Mon, 17 Apr 2017 16:19:54 -0500
Subject: [PATCH] correct error mesages for all question types

---
 app/views/quiz/_radio.html.erb          | 17 ++++++++---------
 test/integration/question_error_test.rb | 12 ++++++------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/views/quiz/_radio.html.erb b/app/views/quiz/_radio.html.erb
index e331e22..1edc412 100644
--- a/app/views/quiz/_radio.html.erb
+++ b/app/views/quiz/_radio.html.erb
@@ -1,15 +1,14 @@
 <%  answer_string = answer.try(:answer) || answer %>
 <%= form.collection_radio_buttons(:answer, question.input_options, :to_s, :to_s, {}, {class: ""}) do | option | %>
+    <%
+      option_id = "#{question.question_id}#{sanitize_to_id(option.value)}"
+      checked = answer_string == option.value ? 'checked' : ''
+    %>
 
-  <%
-    option_id = "#{question.question_id}#{sanitize_to_id(option.value)}"
-    checked = answer_string == option.value ? 'checked' : ''
-  %>
-
-  <div class="">
-    <%= option.radio_button( id: option_id, checked: checked, data: { last: checked } ) %>
-    <%= option.label(for: option_id) %>
-  </div>
+    <div class="">
+      <%= option.radio_button( id: option_id, checked: checked, data: { last: checked } ) %>
+      <%= option.label(for: option_id) %>
+    </div>
 
 <% end %>
 
diff --git a/test/integration/question_error_test.rb b/test/integration/question_error_test.rb
index 4525962..572824e 100644
--- a/test/integration/question_error_test.rb
+++ b/test/integration/question_error_test.rb
@@ -7,19 +7,19 @@ class QuestionErrorTest < ActionDispatch::IntegrationTest
 
     # text
     post post_answer_path, params: { answer: { question_id: questions(:fed1).id } }
-    assert_select 'h2', questions(:fed1).question
+    assert_select 'h1', questions(:fed1).question
     assert_select '.error', /an answer/
     post post_answer_path, params: { answer: { question_id: questions(:fed1).id, answer: "fooBarBaz" } }
 
     # checkbox
     post post_answer_path, params: { answer: { question_id: questions(:fed2).id } }
-    assert_select 'h2', questions(:fed2).question
+    assert_select 'h1', questions(:fed2).question
     assert_select '.error', /an answer/
     post post_answer_path, params: { answer: { question_id: questions(:fed2).id, answer: "fooBarBaz" } }
 
     # live_code
     post post_answer_path, params: { answer: { question_id: questions(:fed3).id } }
-    assert_select 'h2', questions(:fed3).question
+    assert_select 'h1', questions(:fed3).question
     assert_select '.error', /comments or code/
     post post_answer_path, params: { answer: {
       question_id: questions(:fed3).id, answer_hash: { html: "fooBarBaz" }
@@ -30,7 +30,7 @@ class QuestionErrorTest < ActionDispatch::IntegrationTest
 
     # radio
     post post_answer_path, params: { answer: { question_id: questions(:fed5).id } }
-    assert_select 'h2', questions(:fed5).question
+    assert_select 'h1', questions(:fed5).question
     assert_select '.error', /an answer/
     post post_answer_path, params: { answer: { question_id: questions(:fed5).id, answer: "fooBarBaz" } }
 
@@ -44,7 +44,7 @@ class QuestionErrorTest < ActionDispatch::IntegrationTest
 
     # radio_other
     post post_answer_path, params: { answer: { question_id: questions(:fed8).id } }
-    assert_select 'h2', questions(:fed8).question
+    assert_select 'h1', questions(:fed8).question
     assert_select '.error', /an answer/
     post post_answer_path, params: { answer: {
       question_id: questions(:fed8).id, answer_hash: { options: "fooBarBaz" }
@@ -52,7 +52,7 @@ class QuestionErrorTest < ActionDispatch::IntegrationTest
 
     # checkbox_other
     post post_answer_path, params: { answer: { question_id: questions(:fed9).id } }
-    assert_select 'h2', questions(:fed9).question
+    assert_select 'h1', questions(:fed9).question
     assert_select '.error', /an answer/
     post post_answer_path, params: { answer: {
       question_id: questions(:fed9).id, answer_hash: { options: "fooBarBaz" }