decidim-forms 0.28.6 → 0.29.0.rc1

data/config/locales/zh-TW.yml

@@ -4,6 +4,8 @@ zh-TW:
     attributes:
       answer:
         body: 回答
+        choices: 選項
+        selected_choices: 已選擇的選項
       question:
         max_choices: 選擇的最大數量
         question_type: 類別
@@ -14,8 +16,12 @@ zh-TW:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: 需要重新附加
+            body:
+              too_long: 太長
             choices:
-              too_many: 太多了
+              missing: 尚未完成
         questionnaire:
           request_invalid: 處理請求時發生錯誤。請再試一次。
   decidim:
@@ -31,14 +37,24 @@ zh-TW:
             show: 顯示回應
           answer_option:
             answer_option: 答案選項：
+            free_text: 免費文字
             remove: 移除
             statement: 聲明
           answers:
             actions:
+              back: 返回回覆
+              export: 匯出
+              next: 下一個 ›
+              previous: "‹ 上一篇"
               show: 顯示答案
             empty: 目前尚未回答
+            export:
+              answer:
+                title: '回應 #%{number}'
             export_response:
               title: 調查問卷使用者回答_%{token}
+            index:
+              title: "%{total} 個回應總數"
             show:
               title: '回答#%{number}'
           display_condition:
@@ -64,10 +80,14 @@ zh-TW:
             title: 編輯問卷內容
           form:
             add_question: 新增問題
+            add_separator: 新增分隔線
+            add_title_and_description: 新增標題與描述
+            already_answered_warning: 已有使用者回答此表單，因此您無法修改問題。
             collapse: 收起所有問題
             expand: 展開所有問題
             preview: 預覽
             title: 編輯問卷表單%{questionnaire_for}
+            unpublished_warning: 此表單尚未發佈。您可以修改其問題，但這樣做將刪除目前的回答。
           matrix_row:
             matrix_row: 列
             remove: 移除
@@ -106,6 +126,9 @@ zh-TW:
       admin_log:
         questionnaire:
           update: "%{user_name} 更新了 %{resource_name} 問卷模板"
+      errors:
+        answer:
+          body: 內容不能為空
       images:
         dimensions: "%{width} x %{height} 像素"
         processors:
@@ -121,15 +144,20 @@ zh-TW:
         single_option: 單選
         sorting: 排序中
         title_and_description: 標題和描述
+      questionnaire_answer_presenter:
+        download_attachment: 下載附件
       questionnaires:
         answer:
           invalid: 回答表單時出現問題
+          max_choices_alert: 選擇的項目太多了
           success: 表單已成功回答
         question:
           max_choices: '最多選擇數量： %{n}'
         show:
           answer_questionnaire:
-            sign_in_description: 登入以填寫問卷
+            already_have_an_account?: 已經有帳號了嗎？
+            are_you_new?: 新用戶?
+            sign_up_description: 建立參與者帳號以填寫問卷
             title: 回答表單 
           current_step: 步驟%{step}
           of_total_steps: 的%{total_steps}
@@ -150,11 +178,18 @@ zh-TW:
           tos_agreement: 透過參與，您同意其服務條款
       step_navigation:
         show:
+          are_you_sure: 此操作無法撤消，您將無法編輯您的答案。您確定嗎？
           back: 返回
           continue: 繼續
           submit: 提交
       user_answers_serializer:
         body: 回答
+        completion: 完成
         created_at: 回答時間
         id: 回答 ID
+        ip_hash: IP Hash
         question: 問題
+        registered: 已註冊
+        session_token: 使用者識別碼
+        unregistered: 未註冊
+        user_status: 用戶狀態

data/db/migrate/20240402092039_add_answer_options_counter_cache_to_questions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddAnswerOptionsCounterCacheToQuestions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_forms_questions, :answer_options_count, :integer, null: false, default: 0
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Forms::Question.reset_column_information
+        Decidim::Forms::Question.find_each do |record|
+          record.class.reset_counters(record.id, :answer_options)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20240402095253_add_matrix_row_counter_cache_to_questions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddMatrixRowCounterCacheToQuestions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_forms_questions, :matrix_rows_count, :integer, null: false, default: 0
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Forms::Question.reset_column_information
+        Decidim::Forms::Question.find_each do |record|
+          record.class.reset_counters(record.id, :matrix_rows)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20240416111953_add_display_conditions_counter_cache_to_questions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDisplayConditionsCounterCacheToQuestions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_forms_questions, :display_conditions_count, :integer, null: false, default: 0
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Forms::Question.reset_column_information
+        Decidim::Forms::Question.find_each do |record|
+          record.class.reset_counters(record.id, :display_conditions)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20240416113926_add_display_conditions_for_other_questions_counter_cache_to_questions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDisplayConditionsForOtherQuestionsCounterCacheToQuestions < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_forms_questions, :display_conditions_for_other_questions_count, :integer, null: false, default: 0
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Forms::Question.reset_column_information
+        Decidim::Forms::Question.find_each do |record|
+          record.class.reset_counters(record.id, :display_conditions_for_other_questions)
+        end
+      end
+    end
+  end
+end

data/decidim-forms.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Forms.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Rubén González Valero"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-forms"
   s.summary = "Decidim forms"
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim::Forms.version
   s.add_dependency "wicked_pdf", "~> 2.1"
+  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
 
   s.add_development_dependency "decidim-admin", Decidim::Forms.version
   s.add_development_dependency "decidim-dev", Decidim::Forms.version

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

@@ -10,7 +10,7 @@ shared_examples_for "has questionnaire" do
       expect(page).to have_i18n_content(questionnaire.title)
       expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
 
-      expect(page).not_to have_css(".form.answer-questionnaire")
+      expect(page).to have_no_css(".form.answer-questionnaire")
 
       within "[data-question-readonly]" do
         expect(page).to have_i18n_content(question.body)
@@ -46,7 +46,7 @@ shared_examples_for "has questionnaire" do
       check "questionnaire_tos_agreement"
 
       accept_confirm do
-        click_button "Submit"
+        click_on "Submit"
       end
 
       expect(page).to have_admin_callout(callout_success)
@@ -57,32 +57,6 @@ shared_examples_for "has questionnaire" do
       expect(page).to have_no_i18n_content(question.body)
     end
 
-    context "and there is a mandatory question" do
-      let!(:question) do
-        create(
-          :questionnaire_question,
-          questionnaire:,
-          question_type: "short_answer",
-          position: 0,
-          mandatory: true
-        )
-      end
-
-      before do
-        visit questionnaire_public_path
-      end
-
-      it "it renders the asterisk as a separated element" do
-        within "label.answer-questionnaire__question-label" do
-          expect(page).to have_content(translated_attribute(question.body).to_s)
-          within "span.label-required.has-tip" do
-            expect(page).to have_content("*")
-            expect(page).to have_content("Required field")
-          end
-        end
-      end
-    end
-
     context "with multiple steps" do
       let!(:separator) { create(:questionnaire_question, questionnaire:, position: 1, question_type: :separator) }
       let!(:question2) { create(:questionnaire_question, questionnaire:, position: 2) }
@@ -95,18 +69,18 @@ shared_examples_for "has questionnaire" do
         expect(page).to have_content("Step 1 of 2")
 
         within ".answer-questionnaire__submit", match: :first do
-          expect(page).not_to have_content("Back")
+          expect(page).to have_no_content("Back")
         end
 
         answer_first_questionnaire
 
-        expect(page).not_to have_selector(".success.flash")
+        expect(page).to have_no_css(".success.flash")
       end
 
       it "allows revisiting previously-answered questionnaires with my answers" do
         answer_first_questionnaire
 
-        click_button "Back"
+        click_on "Back"
 
         expect(page).to have_content("Step 1 of 2")
         expect(page).to have_field("questionnaire_responses_0", with: "My first answer")
@@ -116,7 +90,7 @@ shared_examples_for "has questionnaire" do
         answer_first_questionnaire
 
         check "questionnaire_tos_agreement"
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
 
@@ -127,10 +101,10 @@ shared_examples_for "has questionnaire" do
 
       def answer_first_questionnaire
         within "#step-0" do
-          expect(page).not_to have_selector("#questionnaire_tos_agreement")
+          expect(page).to have_no_css("#questionnaire_tos_agreement")
 
           fill_in question.body["en"], with: "My first answer"
-          click_button "Continue"
+          click_on "Continue"
         end
         expect(page).to have_content("Step 2 of 2")
       end
@@ -174,7 +148,7 @@ shared_examples_for "has questionnaire" do
       it "does not leak defaults from other answers" do
         visit questionnaire_public_path
 
-        expect(page).not_to have_field(type: "radio", checked: true)
+        expect(page).to have_no_field(type: "radio", checked: true)
       end
     end
 
@@ -205,7 +179,7 @@ shared_examples_for "has questionnaire" do
 
       before do
         visit questionnaire_public_path
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
       end
 
       it_behaves_like "a correctly ordered questionnaire"
@@ -246,7 +220,7 @@ shared_examples_for "has questionnaire" do
         it "does not show message indicating number of characters left" do
           visit questionnaire_public_path
 
-          expect(page).not_to have_content("characters left")
+          expect(page).to have_no_content("characters left")
         end
       end
     end
@@ -255,7 +229,7 @@ shared_examples_for "has questionnaire" do
       include_context "when a non multiple choice question is mandatory"
 
       before do
-        click_button "Submit"
+        click_on "Submit"
       end
 
       it "submits the form and shows errors" do
@@ -268,14 +242,14 @@ shared_examples_for "has questionnaire" do
       include_context "when a non multiple choice question is mandatory"
 
       before do
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
       end
 
       it "shows errors without submitting the form" do
-        expect(page).not_to have_selector ".alert.flash"
+        expect(page).to have_no_css ".alert.flash"
         different_error = I18n.t("decidim.forms.questionnaires.answer.max_choices_alert")
         expect(different_error).to eq("There are too many choices selected")
-        expect(page).not_to have_content(different_error)
+        expect(page).to have_no_content(different_error)
 
         expect(page).to have_content("cannot be blank")
       end
@@ -301,7 +275,7 @@ shared_examples_for "has questionnaire" do
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
       end
 
       it "submits the form and shows errors" do
@@ -316,7 +290,7 @@ shared_examples_for "has questionnaire" do
       it "properly interprets HTML descriptions" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector("b", text: "This question is important")
+        expect(page).to have_css("b", text: "This question is important")
       end
     end
 
@@ -361,7 +335,7 @@ shared_examples_for "has questionnaire" do
         let(:question_type) { "single_option" }
 
         it "renders them as radio buttons with attached text fields disabled by default" do
-          expect(page).to have_selector(".js-radio-button-collection input[type=radio]", count: 3)
+          expect(page).to have_css(".js-radio-button-collection input[type=radio]", count: 3)
 
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", disabled: true, count: 1)
 
@@ -375,7 +349,7 @@ shared_examples_for "has questionnaire" do
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          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")
@@ -390,7 +364,7 @@ shared_examples_for "has questionnaire" do
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
@@ -417,7 +391,7 @@ shared_examples_for "has questionnaire" do
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          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")
@@ -432,7 +406,7 @@ shared_examples_for "has questionnaire" do
           fill_in "questionnaire_responses_0_choices_2_custom_body", with: "Cacatua"
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
           expect(page).to have_field("questionnaire_responses_0_choices_2_custom_body", with: "Cacatua")
@@ -449,7 +423,7 @@ shared_examples_for "has questionnaire" do
       it "renders the answer as a textarea" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector("textarea#questionnaire_responses_0")
+        expect(page).to have_css("textarea#questionnaire_responses_0")
       end
 
       it_behaves_like "question has a character limit"
@@ -475,13 +449,13 @@ shared_examples_for "has questionnaire" do
       it "renders answers as a collection of radio buttons" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector(".js-radio-button-collection input[type=radio]", count: 2)
+        expect(page).to have_css(".js-radio-button-collection input[type=radio]", count: 2)
 
         choose answer_options[0]["body"][:en]
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
 
@@ -499,16 +473,16 @@ shared_examples_for "has questionnaire" do
       it "renders answers as a collection of radio buttons" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector(".js-check-box-collection input[type=checkbox]", count: 3)
+        expect(page).to have_css(".js-check-box-collection input[type=checkbox]", count: 3)
 
-        expect(page).not_to have_content("Max choices:")
+        expect(page).to have_no_content("Max choices:")
 
         check answer_options[0]["body"][:en]
         check answer_options[1]["body"][:en]
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
 
@@ -533,14 +507,14 @@ shared_examples_for "has questionnaire" do
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout("There was a problem answering")
         expect(page).to have_content("are too many")
 
         uncheck answer_options[2]["body"][:en]
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
       end
@@ -565,7 +539,7 @@ shared_examples_for "has questionnaire" do
       it "renders the question answers as a collection of divs sortable on drag and drop" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector("div.answer-questionnaire__sorting.js-collection-input", count: 5)
+        expect(page).to have_css("div.answer-questionnaire__sorting.js-collection-input", count: 5)
 
         %w(We all like dark chocolate).each do |term|
           expect(page).to have_content(term)
@@ -581,7 +555,7 @@ shared_examples_for "has questionnaire" do
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
         expect(Decidim::Forms::Answer.first.choices.pluck(:position, :body)).to eq(
@@ -609,7 +583,7 @@ shared_examples_for "has questionnaire" do
       it "renders the question answers as a collection of radio buttons" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector(".js-radio-button-collection input[type=radio]", count: 4)
+        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(" "))
@@ -621,7 +595,7 @@ shared_examples_for "has questionnaire" do
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
 
@@ -642,7 +616,7 @@ shared_examples_for "has questionnaire" do
         radio_buttons = page.all(".js-radio-button-collection input[type=radio]")
         choose radio_buttons[1][:id]
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout("There was a problem answering")
 
@@ -660,7 +634,7 @@ shared_examples_for "has questionnaire" do
           choose radio_buttons[0][:id]
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
           expect(page).to have_content("Choices are not complete")
@@ -689,7 +663,7 @@ shared_examples_for "has questionnaire" do
       it "renders the question answers as a collection of check boxes" do
         visit questionnaire_public_path
 
-        expect(page).to have_selector(".js-check-box-collection input[type=checkbox]", count: 6)
+        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(" "))
@@ -702,7 +676,7 @@ shared_examples_for "has questionnaire" do
 
         check "questionnaire_tos_agreement"
 
-        accept_confirm { click_button "Submit" }
+        accept_confirm { click_on "Submit" }
 
         expect(page).to have_admin_callout(callout_success)
 
@@ -718,7 +692,7 @@ shared_examples_for "has questionnaire" do
         expect(third_choice).to eq([question.answer_options.first.id, question.matrix_rows.last.id])
       end
 
-      context "when the question hax max_choices defined" do
+      context "when the question has max_choices defined" do
         let!(:max_choices) { 2 }
 
         it "respects the max number of choices" do
@@ -747,7 +721,7 @@ shared_examples_for "has questionnaire" do
 
           check "questionnaire_tos_agreement"
 
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
           expect(page).to have_content("are too many")
@@ -756,7 +730,7 @@ shared_examples_for "has questionnaire" do
 
           uncheck checkboxes[5][:id]
 
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout(callout_success)
         end
@@ -772,7 +746,7 @@ shared_examples_for "has questionnaire" do
           check checkboxes[0][:id]
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
           expect(page).to have_content("Choices are not complete")
@@ -792,7 +766,7 @@ shared_examples_for "has questionnaire" do
           check checkboxes[5][:id]
 
           check "questionnaire_tos_agreement"
-          accept_confirm { click_button "Submit" }
+          accept_confirm { click_on "Submit" }
 
           expect(page).to have_admin_callout("There was a problem answering")
 
@@ -1332,7 +1306,7 @@ shared_examples_for "has questionnaire" do
 
             check "questionnaire_tos_agreement"
 
-            accept_confirm { click_button "Submit" }
+            accept_confirm { click_on "Submit" }
 
             expect(page).to have_admin_callout(callout_success)
           end

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

@@ -38,10 +38,10 @@ shared_examples_for "manage questionnaire answers" do
     context "and managing answers page" do
       before do
         visit questionnaire_edit_path
-        click_link "Show responses"
+        click_on "Show responses"
       end
 
-      it "shows the anwers page" do
+      it "shows the answers page" do
         expect(page).to have_content(answer1.body)
         expect(page).to have_content(answer1.question.body["en"])
         expect(page).to have_content(answer2.body)
@@ -66,7 +66,7 @@ shared_examples_for "manage questionnaire answers" do
         let(:first_type) { "long_answer" }
 
         it "shows session token" do
-          expect(page).not_to have_content(answer1.body)
+          expect(page).to have_no_content(answer1.body)
           expect(page).to have_content(answer1.session_token)
           expect(page).to have_content(answer2.session_token)
           expect(page).to have_content(answer3.session_token)
@@ -98,36 +98,36 @@ shared_examples_for "manage questionnaire answers" do
 
       before do
         visit questionnaire_edit_path
-        click_link "Show responses"
+        click_on "Show responses"
       end
 
       it "shows all the questions and responses" do
-        click_link answer1.body, match: :first
+        click_on answer1.body, match: :first
         expect(page).to have_content(first.body["en"])
         expect(page).to have_content(second.body["en"])
         expect(page).to have_content(answer1.body)
       end
 
       it "first answer has a next link" do
-        click_link answer1.body, match: :first
+        click_on answer1.body, match: :first
         expect(page).to have_link("Next ›")
-        expect(page).not_to have_link("‹ Prev")
+        expect(page).to have_no_link("‹ Prev")
       end
 
       it "second answer has prev/next links" do
-        click_link answer2.body, match: :first
+        click_on answer2.body, match: :first
         expect(page).to have_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
 
       it "third answer has prev link" do
-        click_link answer3.session_token, match: :first
-        expect(page).not_to have_link("Next ›")
+        click_on answer3.session_token, match: :first
+        expect(page).to have_no_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
 
       it "third answer has download link for the attachments" do
-        click_link answer3.session_token, match: :first
+        click_on answer3.session_token, match: :first
         expect(page).to have_content(translated(file_answer.attachments.first.title))
         expect(page).to have_content(translated(file_answer.attachments.second.title))
       end
@@ -140,7 +140,7 @@ shared_examples_for "manage questionnaire answers" do
         end
 
         it "third answer has download link for the attachments" do
-          click_link answer3.session_token, match: :first
+          click_on answer3.session_token, match: :first
           expect(page).to have_content("Download attachment")
         end
       end