decidim-forms 0.30.2 → 0.31.0.rc1

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -4,14 +4,14 @@ require "spec_helper"
 
 shared_examples_for "has questionnaire" do
   context "when the user is not logged in" do
-    it "does not allow answering the questionnaire" do
+    it "does not allow responding the questionnaire" do
       visit questionnaire_public_path
       see_questionnaire_questions
 
       expect(page).to have_i18n_content(questionnaire.title)
       expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
 
-      expect(page).to have_no_css(".form.answer-questionnaire")
+      expect(page).to have_no_css(".form.response-questionnaire")
 
       within "[data-question-readonly]" do
         expect(page).to have_i18n_content(question.body)
@@ -37,7 +37,7 @@ shared_examples_for "has questionnaire" do
       end
     end
 
-    it "allows answering the questionnaire" do
+    it "allows responding the questionnaire" do
       visit questionnaire_public_path
 
       expect(page).to have_i18n_content(questionnaire.title)
@@ -45,7 +45,7 @@ shared_examples_for "has questionnaire" do
 
       see_questionnaire_questions
 
-      fill_in question.body["en"], with: "My first answer"
+      fill_in question.body["en"], with: "My first response"
 
       check "questionnaire_tos_agreement"
 
@@ -58,7 +58,7 @@ shared_examples_for "has questionnaire" do
       visit questionnaire_public_path
       see_questionnaire_questions
 
-      expect(page).to have_content("You have already answered this form.")
+      expect(page).to have_content("You have already responded this form.")
       expect(page).to have_no_i18n_content(question.body)
     end
 
@@ -67,7 +67,7 @@ shared_examples_for "has questionnaire" do
         create(
           :questionnaire_question,
           questionnaire:,
-          question_type: "short_answer",
+          question_type: "short_response",
           position: 0,
           mandatory: true
         )
@@ -79,9 +79,9 @@ shared_examples_for "has questionnaire" do
 
       it "it renders the asterisk as a separated element" do
         see_questionnaire_questions
-        within "label.answer-questionnaire__question-label" do
+        within "label.response-questionnaire__question-label" do
           expect(page).to have_content(translated_attribute(question.body).to_s)
-          within "span.label-required.has-tip" do
+          within "span.label-required" do
             expect(page).to have_content("*")
             expect(page).to have_content("Required field")
           end
@@ -98,29 +98,29 @@ shared_examples_for "has questionnaire" do
         see_questionnaire_questions
       end
 
-      it "allows answering the first questionnaire" do
+      it "allows responding the first questionnaire" do
         expect(page).to have_content("Step 1 of 2")
 
-        within ".answer-questionnaire__submit", match: :first do
+        within ".response-questionnaire__submit", match: :first do
           expect(page).to have_no_content("Back")
         end
 
-        answer_first_questionnaire
+        response_first_questionnaire
 
         expect(page).to have_no_css(".success.flash")
       end
 
-      it "allows revisiting previously-answered questionnaires with my answers" do
-        answer_first_questionnaire
+      it "allows revisiting previously-responded questionnaires with my responses" do
+        response_first_questionnaire
 
         click_on "Back"
 
         expect(page).to have_content("Step 1 of 2")
-        expect(page).to have_field("questionnaire_responses_0", with: "My first answer")
+        expect(page).to have_field("questionnaire_responses_0", with: "My first response")
       end
 
-      it "finishes the submission when answering the last questionnaire" do
-        answer_first_questionnaire
+      it "finishes the submission when responding the last questionnaire" do
+        response_first_questionnaire
 
         check "questionnaire_tos_agreement"
         accept_confirm { click_on "Submit" }
@@ -130,32 +130,32 @@ shared_examples_for "has questionnaire" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_content("You have already answered this form.")
+        expect(page).to have_content("You have already responded this form.")
       end
 
-      def answer_first_questionnaire
+      def response_first_questionnaire
         within "#step-0" do
           expect(page).to have_no_css("#questionnaire_tos_agreement")
 
-          fill_in question.body["en"], with: "My first answer"
+          fill_in question.body["en"], with: "My first response"
           click_on "Continue"
         end
         expect(page).to have_content("Step 2 of 2")
       end
     end
 
-    it "requires confirmation when exiting mid-answering" do
+    it "requires confirmation when exiting mid-responding" do
       visit questionnaire_public_path
       see_questionnaire_questions
 
-      fill_in question.body["en"], with: "My first answer"
+      fill_in question.body["en"], with: "My first response"
 
       click_on translated_attribute(component.name)
 
       expect(page).to have_current_path(questionnaire_public_path)
     end
 
-    context "when the questionnaire has already been answered by someone else" do
+    context "when the questionnaire has already been responded by someone else" do
       let!(:question) do
         create(
           :questionnaire_question,
@@ -170,15 +170,15 @@ shared_examples_for "has questionnaire" do
       end
 
       before do
-        answer = create(:answer, id: 1, questionnaire:, question:)
+        response = create(:response, id: 1, questionnaire:, question:)
 
-        answer.choices.create!(
-          answer_option: Decidim::Forms::AnswerOption.first,
+        response.choices.create!(
+          response_option: Decidim::Forms::ResponseOption.first,
           body: "Lalalilo"
         )
       end
 
-      it "does not leak defaults from other answers" do
+      it "does not leak defaults from other responses" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
@@ -188,12 +188,12 @@ shared_examples_for "has questionnaire" do
 
     shared_examples_for "a correctly ordered questionnaire" do
       it "displays the questions ordered by position starting with one" do
-        form_fields = all(".answer-questionnaire__question")
+        form_fields = all(".response-questionnaire__question")
 
         expect(form_fields[0]).to have_i18n_content(question.body)
         expect(form_fields[1]).to have_i18n_content(other_question.body)
         2.times do |index|
-          expect(form_fields[index]).to have_css("[data-answer-idx='#{index + 1}']")
+          expect(form_fields[index]).to have_css("[data-response-idx='#{index + 1}']")
         end
       end
     end
@@ -226,7 +226,7 @@ shared_examples_for "has questionnaire" do
         create(
           :questionnaire_question,
           questionnaire:,
-          question_type: "short_answer",
+          question_type: "short_response",
           position: 0,
           mandatory: true
         )
@@ -286,7 +286,7 @@ shared_examples_for "has questionnaire" do
       it "submits the form and shows errors" do
         expect(page).to have_css ".alert.flash"
         expect(page).to have_admin_callout(callout_failure)
-        different_error = I18n.t("decidim.forms.questionnaires.answer.max_choices_alert")
+        different_error = I18n.t("decidim.forms.questionnaires.response.max_choices_alert")
         expect(different_error).to eq("There are too many choices selected")
         expect(page).to have_no_content(different_error)
 
@@ -336,7 +336,7 @@ shared_examples_for "has questionnaire" do
     end
 
     describe "free text options" do
-      let(:answer_option_bodies) { Array.new(3) { Decidim::Faker::Localized.sentence } }
+      let(:response_option_bodies) { Array.new(3) { Decidim::Faker::Localized.sentence } }
       let(:max_characters) { 0 }
       let!(:question) do
         create(
@@ -346,9 +346,9 @@ shared_examples_for "has questionnaire" do
           max_characters:,
           position: 1,
           options: [
-            { "body" => answer_option_bodies[0] },
-            { "body" => answer_option_bodies[1] },
-            { "body" => answer_option_bodies[2], "free_text" => true }
+            { "body" => response_option_bodies[0] },
+            { "body" => response_option_bodies[1] },
+            { "body" => response_option_bodies[2], "free_text" => true }
           ]
         )
       end
@@ -381,34 +381,34 @@ shared_examples_for "has questionnaire" do
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", disabled: true, count: 1)
 
-          choose answer_option_bodies[2]["en"]
+          choose response_option_bodies[2]["en"]
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", disabled: false, count: 1)
         end
 
         it "saves the free text in a separate field if submission correct" do
-          choose answer_option_bodies[2]["en"]
+          choose response_option_bodies[2]["en"]
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout(callout_success)
-          expect(Decidim::Forms::Answer.first.choices.first.custom_body).to eq("Cacatua")
+          expect(Decidim::Forms::Response.first.choices.first.custom_body).to eq("Cacatua")
         end
 
         it "preserves the previous custom body if submission not correct" do
-          check other_question.answer_options.first.body["en"]
-          check other_question.answer_options.second.body["en"]
-          check other_question.answer_options.third.body["en"]
+          check other_question.response_options.first.body["en"]
+          check other_question.response_options.second.body["en"]
+          check other_question.response_options.third.body["en"]
 
-          choose answer_option_bodies[2]["en"]
+          choose response_option_bodies[2]["en"]
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
 
@@ -423,20 +423,20 @@ shared_examples_for "has questionnaire" do
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", disabled: true, count: 1)
 
-          check answer_option_bodies[2]["en"]
+          check response_option_bodies[2]["en"]
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", disabled: false, count: 1)
         end
 
         it "saves the free text in a separate field if submission correct" do
-          check answer_option_bodies[2]["en"]
+          check response_option_bodies[2]["en"]
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout(callout_success)
-          expect(Decidim::Forms::Answer.first.choices.first.custom_body).to eq("Cacatua")
+          expect(Decidim::Forms::Response.first.choices.first.custom_body).to eq("Cacatua")
         end
 
         it "preserves the previous custom body if submission not correct" do
@@ -444,13 +444,13 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_responses_1_choices_1_body"
           check "questionnaire_responses_1_choices_2_body"
 
-          check answer_option_bodies[2]["en"]
+          check response_option_bodies[2]["en"]
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
         end
 
@@ -458,11 +458,11 @@ shared_examples_for "has questionnaire" do
       end
     end
 
-    context "when question type is long answer" do
+    context "when question type is long response" do
       let(:max_characters) { 0 }
-      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "long_answer", max_characters:) }
+      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "long_response", max_characters:) }
 
-      it "renders the answer as a textarea" do
+      it "renders the response as a textarea" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
@@ -472,11 +472,11 @@ shared_examples_for "has questionnaire" do
       it_behaves_like "question has a character limit"
     end
 
-    context "when question type is short answer" do
+    context "when question type is short response" do
       let(:max_characters) { 0 }
-      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "short_answer", max_characters:) }
+      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "short_response", max_characters:) }
 
-      it "renders the answer as a text field" do
+      it "renders the response as a text field" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
@@ -487,16 +487,16 @@ shared_examples_for "has questionnaire" do
     end
 
     context "when question type is single option" do
-      let(:answer_options) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
-      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "single_option", options: answer_options) }
+      let(:response_options) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
+      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "single_option", options: response_options) }
 
-      it "renders answers as a collection of radio buttons" do
+      it "renders responses as a collection of radio buttons" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
         expect(page).to have_css(".js-radio-button-collection input[type=radio]", count: 2)
 
-        choose answer_options[0]["body"][:en]
+        choose response_options[0]["body"][:en]
 
         check "questionnaire_tos_agreement"
 
@@ -507,16 +507,16 @@ shared_examples_for "has questionnaire" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_content("You have already answered this form.")
+        expect(page).to have_content("You have already responded this form.")
         expect(page).to have_no_i18n_content(question.body)
       end
     end
 
     context "when question type is multiple option" do
-      let(:answer_options) { Array.new(3) { { "body" => Decidim::Faker::Localized.sentence } } }
-      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "multiple_option", options: answer_options) }
+      let(:response_options) { Array.new(3) { { "body" => Decidim::Faker::Localized.sentence } } }
+      let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "multiple_option", options: response_options) }
 
-      it "renders answers as a collection of radio buttons" do
+      it "renders responses as a collection of radio buttons" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
@@ -524,8 +524,8 @@ shared_examples_for "has questionnaire" do
 
         expect(page).to have_no_content("Max choices:")
 
-        check answer_options[0]["body"][:en]
-        check answer_options[1]["body"][:en]
+        check response_options[0]["body"][:en]
+        check response_options[1]["body"][:en]
 
         check "questionnaire_tos_agreement"
 
@@ -536,7 +536,7 @@ shared_examples_for "has questionnaire" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_content("You have already answered this form.")
+        expect(page).to have_content("You have already responded this form.")
         expect(page).to have_no_i18n_content(question.body)
       end
 
@@ -548,9 +548,9 @@ shared_examples_for "has questionnaire" do
 
         expect(page).to have_content("Max choices: 2")
 
-        check answer_options[0]["body"][:en]
-        check answer_options[1]["body"][:en]
-        check answer_options[2]["body"][:en]
+        check response_options[0]["body"][:en]
+        check response_options[1]["body"][:en]
+        check response_options[2]["body"][:en]
 
         expect(page).to have_content("too many choices")
 
@@ -558,10 +558,10 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout("There was a problem answering")
+        expect(page).to have_admin_callout("There was a problem responding")
         expect(page).to have_content("are too many")
 
-        uncheck answer_options[2]["body"][:en]
+        uncheck response_options[2]["body"][:en]
 
         accept_confirm { click_on "Submit" }
 
@@ -585,11 +585,11 @@ shared_examples_for "has questionnaire" do
         )
       end
 
-      it "renders the question answers as a collection of divs sortable on drag and drop" do
+      it "renders the question responses as a collection of divs sortable on drag and drop" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_css("div.answer-questionnaire__sorting.js-collection-input", count: 5)
+        expect(page).to have_css("div.response-questionnaire__sorting.js-collection-input", count: 5)
 
         %w(We all like dark chocolate).each do |term|
           expect(page).to have_content(term)
@@ -601,7 +601,7 @@ shared_examples_for "has questionnaire" do
         see_questionnaire_questions
 
         %w(We all like dark chocolate).reverse.each do |text|
-          find("div.answer-questionnaire__sorting", text:).drag_to(find("div.answer-questionnaire__sorting", match: :first))
+          find("div.response-questionnaire__sorting", text:).drag_to(find("div.response-questionnaire__sorting", match: :first))
         end
 
         check "questionnaire_tos_agreement"
@@ -609,7 +609,7 @@ shared_examples_for "has questionnaire" do
         accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
-        expect(Decidim::Forms::Answer.first.choices.pluck(:position, :body)).to eq(
+        expect(Decidim::Forms::Response.first.choices.pluck(:position, :body)).to eq(
           [[0, "We"], [1, "all"], [2, "like"], [3, "dark"], [4, "chocolate"]]
         )
       end
@@ -617,7 +617,7 @@ shared_examples_for "has questionnaire" do
 
     context "when question type is matrix_single" do
       let(:matrix_rows) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
-      let(:answer_options) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
+      let(:response_options) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
       let(:mandatory) { false }
 
       let!(:question) do
@@ -626,19 +626,19 @@ shared_examples_for "has questionnaire" do
           questionnaire:,
           question_type: "matrix_single",
           rows: matrix_rows,
-          options: answer_options,
+          options: response_options,
           mandatory:
         )
       end
 
-      it "renders the question answers as a collection of radio buttons" do
+      it "renders the question responses as a collection of radio buttons" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
         expect(page).to have_css(".js-radio-button-collection input[type=radio]", count: 4)
 
         expect(page).to have_content(matrix_rows.map { |row| row["body"]["en"] }.join("\n"))
-        expect(page).to have_content(answer_options.map { |option| option["body"]["en"] }.join(" "))
+        expect(page).to have_content(response_options.map { |option| option["body"]["en"] }.join(" "))
 
         radio_buttons = page.all(".js-radio-button-collection input[type=radio]")
 
@@ -654,16 +654,16 @@ shared_examples_for "has questionnaire" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_content("You have already answered this form.")
+        expect(page).to have_content("You have already responded this form.")
         expect(page).to have_no_i18n_content(question.body)
 
-        first_choice, last_choice = Decidim::Forms::Answer.last.choices.pluck(:decidim_answer_option_id, :decidim_question_matrix_row_id)
+        first_choice, last_choice = Decidim::Forms::Response.last.choices.pluck(:decidim_response_option_id, :decidim_question_matrix_row_id)
 
-        expect(first_choice).to eq([question.answer_options.first.id, question.matrix_rows.first.id])
-        expect(last_choice).to eq([question.answer_options.last.id, question.matrix_rows.last.id])
+        expect(first_choice).to eq([question.response_options.first.id, question.matrix_rows.first.id])
+        expect(last_choice).to eq([question.response_options.last.id, question.matrix_rows.last.id])
       end
 
-      it "preserves the chosen answers if submission not correct" do
+      it "preserves the chosen responses if submission not correct" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
@@ -672,16 +672,16 @@ shared_examples_for "has questionnaire" do
 
         accept_confirm { click_on "Submit" }
 
-        expect(page).to have_admin_callout("There was a problem answering")
+        expect(page).to have_admin_callout("There was a problem responding")
 
         radio_buttons = page.all(".js-radio-button-collection input[type=radio]")
         expect(radio_buttons.pluck(:checked)).to eq([nil, "true", nil, nil])
       end
 
-      context "when the question is mandatory and the answer is not complete" do
+      context "when the question is mandatory and the response is not complete" do
         let!(:mandatory) { true }
 
-        it "shows an error if the question is mandatory and the answer is not complete" do
+        it "shows an error if the question is mandatory and the response is not complete" do
           visit questionnaire_public_path
           see_questionnaire_questions
 
@@ -691,7 +691,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
           expect(page).to have_content("Choices are not complete")
         end
       end
@@ -699,7 +699,7 @@ shared_examples_for "has questionnaire" do
 
     context "when question type is matrix_multiple" do
       let(:matrix_rows) { Array.new(2) { { "body" => Decidim::Faker::Localized.sentence } } }
-      let(:answer_options) { Array.new(3) { { "body" => Decidim::Faker::Localized.sentence } } }
+      let(:response_options) { Array.new(3) { { "body" => Decidim::Faker::Localized.sentence } } }
       let(:max_choices) { nil }
       let(:mandatory) { false }
 
@@ -709,20 +709,20 @@ shared_examples_for "has questionnaire" do
           questionnaire:,
           question_type: "matrix_multiple",
           rows: matrix_rows,
-          options: answer_options,
+          options: response_options,
           max_choices:,
           mandatory:
         )
       end
 
-      it "renders the question answers as a collection of check boxes" do
+      it "renders the question responses as a collection of check boxes" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
         expect(page).to have_css(".js-check-box-collection input[type=checkbox]", count: 6)
 
         expect(page).to have_content(matrix_rows.map { |row| row["body"]["en"] }.join("\n"))
-        expect(page).to have_content(answer_options.map { |option| option["body"]["en"] }.join(" "))
+        expect(page).to have_content(response_options.map { |option| option["body"]["en"] }.join(" "))
 
         checkboxes = page.all(".js-check-box-collection input[type=checkbox]")
 
@@ -739,14 +739,14 @@ shared_examples_for "has questionnaire" do
         visit questionnaire_public_path
         see_questionnaire_questions
 
-        expect(page).to have_content("You have already answered this form.")
+        expect(page).to have_content("You have already responded this form.")
         expect(page).to have_no_i18n_content(question.body)
 
-        first_choice, second_choice, third_choice = Decidim::Forms::Answer.last.choices.pluck(:decidim_answer_option_id, :decidim_question_matrix_row_id)
+        first_choice, second_choice, third_choice = Decidim::Forms::Response.last.choices.pluck(:decidim_response_option_id, :decidim_question_matrix_row_id)
 
-        expect(first_choice).to eq([question.answer_options.first.id, question.matrix_rows.first.id])
-        expect(second_choice).to eq([question.answer_options.second.id, question.matrix_rows.first.id])
-        expect(third_choice).to eq([question.answer_options.first.id, question.matrix_rows.last.id])
+        expect(first_choice).to eq([question.response_options.first.id, question.matrix_rows.first.id])
+        expect(second_choice).to eq([question.response_options.second.id, question.matrix_rows.first.id])
+        expect(third_choice).to eq([question.response_options.first.id, question.matrix_rows.last.id])
       end
 
       context "when the question has max_choices defined" do
@@ -781,7 +781,7 @@ shared_examples_for "has questionnaire" do
 
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
           expect(page).to have_content("are too many")
 
           checkboxes = page.all(".js-check-box-collection input[type=checkbox]")
@@ -794,7 +794,7 @@ shared_examples_for "has questionnaire" do
         end
       end
 
-      context "when the question is mandatory and the answer is not complete" do
+      context "when the question is mandatory and the response is not complete" do
         let!(:mandatory) { true }
 
         it "shows an error" do
@@ -807,7 +807,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
           expect(page).to have_content("Choices are not complete")
         end
       end
@@ -815,7 +815,7 @@ shared_examples_for "has questionnaire" do
       context "when the submission is not correct" do
         let!(:max_choices) { 2 }
 
-        it "preserves the chosen answers" do
+        it "preserves the chosen responses" do
           visit questionnaire_public_path
           see_questionnaire_questions
 
@@ -828,7 +828,7 @@ shared_examples_for "has questionnaire" do
           check "questionnaire_tos_agreement"
           accept_confirm { click_on "Submit" }
 
-          expect(page).to have_admin_callout("There was a problem answering")
+          expect(page).to have_admin_callout("There was a problem responding")
 
           checkboxes = page.all(".js-check-box-collection input[type=checkbox]")
           expect(checkboxes.pluck(:checked)).to eq(["true", "true", "true", nil, nil, "true"])
@@ -837,7 +837,7 @@ shared_examples_for "has questionnaire" do
     end
 
     describe "display conditions" do
-      let(:answer_options) do
+      let(:response_options) do
         3.times.to_a.map do |x|
           {
             "body" => Decidim::Faker::Localized.sentence,
@@ -857,10 +857,10 @@ shared_examples_for "has questionnaire" do
       end
 
       context "when a question has a display condition" do
-        context "when condition is of type 'answered'" do
+        context "when condition is of type 'responded'" do
           let!(:display_condition) do
             create(:display_condition,
-                   condition_type: "answered",
+                   condition_type: "responded",
                    question:,
                    condition_question:)
           end
@@ -870,8 +870,8 @@ shared_examples_for "has questionnaire" do
             see_questionnaire_questions
           end
 
-          context "when the condition_question type is short answer" do
-            let!(:condition_question_type) { "short_answer" }
+          context "when the condition_question type is short response" do
+            let!(:condition_question_type) { "short_response" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
@@ -888,8 +888,8 @@ shared_examples_for "has questionnaire" do
             end
           end
 
-          context "when the condition_question type is long answer" do
-            let!(:condition_question_type) { "long_answer" }
+          context "when the condition_question type is long response" do
+            let!(:condition_question_type) { "long_response" }
             let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
@@ -909,16 +909,16 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
 
-              choose condition_question.answer_options.second.body["en"]
+              choose condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(false)
             end
@@ -926,34 +926,34 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is multiple option" do
             let!(:condition_question_type) { "multiple_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
 
-              uncheck condition_question.answer_options.first.body["en"]
+              uncheck condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.second.body["en"]
+              check condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
             end
           end
         end
 
-        context "when a question has a display condition of type 'not_answered'" do
+        context "when a question has a display condition of type 'not_responded'" do
           let!(:display_condition) do
             create(:display_condition,
-                   condition_type: "not_answered",
+                   condition_type: "not_responded",
                    question:,
                    condition_question:)
           end
@@ -963,8 +963,8 @@ shared_examples_for "has questionnaire" do
             see_questionnaire_questions
           end
 
-          context "when the condition_question type is short answer" do
-            let!(:condition_question_type) { "short_answer" }
+          context "when the condition_question type is short response" do
+            let!(:condition_question_type) { "short_response" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(true)
@@ -981,8 +981,8 @@ shared_examples_for "has questionnaire" do
             end
           end
 
-          context "when the condition_question type is long answer" do
-            let!(:condition_question_type) { "long_answer" }
+          context "when the condition_question type is long response" do
+            let!(:condition_question_type) { "long_response" }
             let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
@@ -1002,12 +1002,12 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(true)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
             end
@@ -1015,16 +1015,16 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is multiple option" do
             let!(:condition_question_type) { "multiple_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(true)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
 
-              uncheck condition_question.answer_options.first.body["en"]
+              uncheck condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
             end
@@ -1037,7 +1037,7 @@ shared_examples_for "has questionnaire" do
                    condition_type: "equal",
                    question:,
                    condition_question:,
-                   answer_option: condition_question.answer_options.first)
+                   response_option: condition_question.response_options.first)
           end
 
           before do
@@ -1047,16 +1047,16 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
 
-              choose condition_question.answer_options.second.body["en"]
+              choose condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(false)
             end
@@ -1064,24 +1064,24 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is multiple option" do
             let!(:condition_question_type) { "multiple_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
 
-              uncheck condition_question.answer_options.first.body["en"]
+              uncheck condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.second.body["en"]
+              check condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
             end
@@ -1094,7 +1094,7 @@ shared_examples_for "has questionnaire" do
                    condition_type: "not_equal",
                    question:,
                    condition_question:,
-                   answer_option: condition_question.answer_options.first)
+                   response_option: condition_question.response_options.first)
           end
 
           before do
@@ -1104,16 +1104,16 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.second.body["en"]
+              choose condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(true)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
             end
@@ -1121,24 +1121,24 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is multiple option" do
             let!(:condition_question_type) { "multiple_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.second.body["en"]
+              check condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(true)
 
-              uncheck condition_question.answer_options.second.body["en"]
+              uncheck condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.second.body["en"]
+              check condition_question.response_options.second.body["en"]
 
               expect_question_to_be_visible(true)
             end
@@ -1160,8 +1160,8 @@ shared_examples_for "has questionnaire" do
             see_questionnaire_questions
           end
 
-          context "when the condition_question type is short answer" do
-            let!(:condition_question_type) { "short_answer" }
+          context "when the condition_question type is short response" do
+            let!(:condition_question_type) { "short_response" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
@@ -1183,8 +1183,8 @@ shared_examples_for "has questionnaire" do
             end
           end
 
-          context "when the condition_question type is long answer" do
-            let!(:condition_question_type) { "long_answer" }
+          context "when the condition_question type is long response" do
+            let!(:condition_question_type) { "long_response" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
@@ -1208,13 +1208,13 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
-            let!(:condition_value) { { en: condition_question.answer_options.first.body["en"].split.second.upcase } }
+            let!(:condition_question_options) { response_options }
+            let!(:condition_value) { { en: condition_question.response_options.first.body["en"].split.second.upcase } }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
 
               expect_question_to_be_visible(true)
             end
@@ -1222,22 +1222,22 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is single option with free text" do
             let!(:condition_question_type) { "single_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
             let!(:condition_value) { { en: "forty two" } }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.third.body["en"]
-              fill_in "questionnaire_responses_0_choices_2_custom_body", with: "The answer is #{condition_value[:en]}"
+              choose condition_question.response_options.third.body["en"]
+              fill_in "questionnaire_responses_0_choices_2_custom_body", with: "The response is #{condition_value[:en]}"
               change_focus
 
               expect_question_to_be_visible(true)
 
-              choose condition_question.answer_options.first.body["en"]
+              choose condition_question.response_options.first.body["en"]
               expect_question_to_be_visible(false)
 
-              choose condition_question.answer_options.third.body["en"]
+              choose condition_question.response_options.third.body["en"]
               fill_in "questionnaire_responses_0_choices_2_custom_body", with: "oh no not 42 again"
               change_focus
 
@@ -1247,25 +1247,25 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is multiple option" do
             let!(:condition_question_type) { "multiple_option" }
-            let!(:condition_question_options) { answer_options }
+            let!(:condition_question_options) { response_options }
             let!(:condition_value) { { en: "forty two" } }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.third.body["en"]
-              fill_in "questionnaire_responses_0_choices_2_custom_body", with: "The answer is #{condition_value[:en]}"
+              check condition_question.response_options.third.body["en"]
+              fill_in "questionnaire_responses_0_choices_2_custom_body", with: "The response is #{condition_value[:en]}"
               change_focus
 
               expect_question_to_be_visible(true)
 
-              check condition_question.answer_options.first.body["en"]
+              check condition_question.response_options.first.body["en"]
               expect_question_to_be_visible(true)
 
-              uncheck condition_question.answer_options.third.body["en"]
+              uncheck condition_question.response_options.third.body["en"]
               expect_question_to_be_visible(false)
 
-              check condition_question.answer_options.third.body["en"]
+              check condition_question.response_options.third.body["en"]
               fill_in "questionnaire_responses_0_choices_2_custom_body", with: "oh no not 42 again"
               change_focus
 
@@ -1283,11 +1283,11 @@ shared_examples_for "has questionnaire" do
 
         context "when all conditions are mandatory" do
           let!(:condition_question_type) { "single_option" }
-          let!(:condition_question_options) { answer_options }
+          let!(:condition_question_options) { response_options }
           let!(:display_conditions) do
             [
               create(:display_condition,
-                     condition_type: "answered",
+                     condition_type: "responded",
                      question:,
                      condition_question:,
                      mandatory: true),
@@ -1296,18 +1296,18 @@ shared_examples_for "has questionnaire" do
                      question:,
                      condition_question:,
                      mandatory: true,
-                     answer_option: condition_question.answer_options.second)
+                     response_option: condition_question.response_options.second)
             ]
           end
 
           it "is displayed only if all conditions are fulfilled" do
             expect_question_to_be_visible(false)
 
-            choose condition_question.answer_options.second.body["en"]
+            choose condition_question.response_options.second.body["en"]
 
             expect_question_to_be_visible(false)
 
-            choose condition_question.answer_options.first.body["en"]
+            choose condition_question.response_options.first.body["en"]
 
             expect_question_to_be_visible(true)
           end
@@ -1315,7 +1315,7 @@ shared_examples_for "has questionnaire" do
 
         context "when all conditions are non-mandatory" do
           let!(:condition_question_type) { "multiple_option" }
-          let!(:condition_question_options) { answer_options }
+          let!(:condition_question_options) { response_options }
           let!(:display_conditions) do
             [
               create(:display_condition,
@@ -1323,36 +1323,36 @@ shared_examples_for "has questionnaire" do
                      question:,
                      condition_question:,
                      mandatory: false,
-                     answer_option: condition_question.answer_options.first),
+                     response_option: condition_question.response_options.first),
               create(:display_condition,
                      condition_type: "not_equal",
                      question:,
                      condition_question:,
                      mandatory: false,
-                     answer_option: condition_question.answer_options.third)
+                     response_option: condition_question.response_options.third)
             ]
           end
 
           it "is displayed if any of the conditions is fulfilled" do
             expect_question_to_be_visible(false)
 
-            check condition_question.answer_options.first.body["en"]
+            check condition_question.response_options.first.body["en"]
 
             expect_question_to_be_visible(true)
 
-            uncheck condition_question.answer_options.first.body["en"]
-            check condition_question.answer_options.second.body["en"]
+            uncheck condition_question.response_options.first.body["en"]
+            check condition_question.response_options.second.body["en"]
 
             expect_question_to_be_visible(true)
 
-            check condition_question.answer_options.first.body["en"]
+            check condition_question.response_options.first.body["en"]
 
             expect_question_to_be_visible(true)
           end
         end
 
         context "when a mandatory question has conditions that have not been fulfilled" do
-          let!(:condition_question_type) { "short_answer" }
+          let!(:condition_question_type) { "short_response" }
           let!(:question) { create(:questionnaire_question, questionnaire:, position: 2, mandatory: true) }
           let!(:display_conditions) do
             [
@@ -1369,7 +1369,7 @@ shared_examples_for "has questionnaire" do
             visit questionnaire_public_path
             see_questionnaire_questions
 
-            fill_in condition_question.body["en"], with: "My first answer"
+            fill_in condition_question.body["en"], with: "My first response"
 
             check "questionnaire_tos_agreement"