decidim-forms 0.28.2 → 0.29.0.rc1

data/config/locales/it.yml

@@ -22,7 +22,6 @@ it:
               too_long: è troppo lungo
             choices:
               missing: non sono completi
-              too_many: sono troppi
   decidim:
     forms:
       admin:

data/config/locales/ja.yml

@@ -22,7 +22,7 @@ ja:
               too_long: 長すぎます
             choices:
               missing: は完全ではありません
-              too_many: 多すぎます
+              too_many: 最大 %{count} 個まで選択できます。
         questionnaire:
           request_invalid: リクエストの処理中にエラーが発生しました。もう一度やり直してください。
   decidim:

data/config/locales/lb.yml

@@ -22,7 +22,6 @@ lb:
               too_long: ist zu lang
             choices:
               missing: sind nicht vollständig
-              too_many: sind zu viele
   decidim:
     forms:
       admin:

data/config/locales/lt.yml

@@ -22,7 +22,6 @@ lt:
               too_long: per ilgas
             choices:
               missing: nepilnas - trūksta elementų
-              too_many: per daug
         questionnaire:
           request_invalid: Tvarkant prašymą įvyko klaida. Bandykite dar kartą.
   decidim:
@@ -158,7 +157,6 @@ lt:
           answer_questionnaire:
             already_have_an_account?: Jau turite paskyrą?
             are_you_new?: Naujas naudotojas?
-            sign_in_description: Prisijunkite norėdami dalyvauti apklausoje
             sign_up_description: Norėdami dalyvauti apklausoje, susikurkite dalyvio paskyrą
             title: Atsakyti į formos klausimus
           current_step: Žingsnis %{step}

data/config/locales/lv.yml

@@ -15,7 +15,6 @@ lv:
           attributes:
             choices:
               missing: nav pabeigti
-              too_many: ir par daudz
   decidim:
     forms:
       admin:

data/config/locales/nl.yml

@@ -17,7 +17,6 @@ nl:
           attributes:
             choices:
               missing: zijn niet compleet
-              too_many: zijn te veel
   decidim:
     forms:
       admin:

data/config/locales/no.yml

@@ -22,7 +22,6 @@
               too_long: er for lang
             choices:
               missing: er ikke fullstendig
-              too_many: er for mange
   decidim:
     forms:
       admin:

data/config/locales/pl.yml

@@ -22,7 +22,7 @@ pl:
               too_long: jest zbyt długie
             choices:
               missing: nie są kompletne
-              too_many: jest zbyt wiele
+              too_many: Możesz wybrać maksymalnie %{count}.
         questionnaire:
           request_invalid: Wystąpił błąd podczas obsługi żądania. Spróbuj ponownie.
   decidim:

data/config/locales/pt-BR.yml

@@ -22,7 +22,6 @@ pt-BR:
               too_long: é longo demais
             choices:
               missing: não estão completos
-              too_many: são muitos
   decidim:
     forms:
       admin:

data/config/locales/pt.yml

@@ -22,7 +22,6 @@ pt:
               too_long: é demasiado longo
             choices:
               missing: não estão completos
-              too_many: são demasiados
   decidim:
     forms:
       admin:

data/config/locales/ro-RO.yml

@@ -22,7 +22,6 @@ ro:
               too_long: este prea lung
             choices:
               missing: nu sunt completate
-              too_many: sunt prea multe
         questionnaire:
           request_invalid: A apărut o eroare la procesarea cererii. Te rugăm să încerci din nou.
   decidim:
@@ -158,7 +157,6 @@ ro:
           answer_questionnaire:
             already_have_an_account?: Ai deja un cont?
             are_you_new?: Utilizator nou?
-            sign_in_description: Autentifică-te pentru a participa la sondaj
             sign_up_description: Creați un cont de participant pentru a participa la sondaj
             title: Completează chestionarul
           current_step: Pasul %{step}

data/config/locales/sk.yml

@@ -15,7 +15,6 @@ sk:
           attributes:
             choices:
               missing: nie je kompletné
-              too_many: je príliš veľa
   decidim:
     forms:
       admin:

data/config/locales/sv.yml

@@ -22,7 +22,6 @@ sv:
               too_long: är för långt
             choices:
               missing: är inte fullständiga
-              too_many: är för många
   decidim:
     forms:
       admin:

data/config/locales/tr-TR.yml

@@ -17,7 +17,6 @@ tr:
           attributes:
             choices:
               missing: tamamlanmadı
-              too_many: çok fazla
   decidim:
     forms:
       admin:

data/config/locales/zh-CN.yml

@@ -17,7 +17,6 @@ zh-CN:
           attributes:
             choices:
               missing: 不完成
-              too_many: 太多了
   decidim:
     forms:
       admin:

data/config/locales/zh-TW.yml

@@ -22,7 +22,6 @@ zh-TW:
               too_long: 太長
             choices:
               missing: 尚未完成
-              too_many: 太多了
         questionnaire:
           request_invalid: 處理請求時發生錯誤。請再試一次。
   decidim:
@@ -158,7 +157,6 @@ zh-TW:
           answer_questionnaire:
             already_have_an_account?: 已經有帳號了嗎？
             are_you_new?: 新用戶?
-            sign_in_description: 登入以填寫問卷
             sign_up_description: 建立參與者帳號以填寫問卷
             title: 回答表單 
           current_step: 步驟%{step}

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

@@ -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"

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)
@@ -69,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")
@@ -90,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)
 
@@ -101,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
@@ -148,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
 
@@ -179,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"
@@ -220,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
@@ -229,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
@@ -242,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
@@ -275,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
@@ -290,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
 
@@ -335,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)
 
@@ -349,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")
@@ -364,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")
@@ -391,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")
@@ -406,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")
@@ -423,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"
@@ -449,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)
 
@@ -473,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)
 
@@ -507,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
@@ -539,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)
@@ -555,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(
@@ -583,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(" "))
@@ -595,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)
 
@@ -616,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")
 
@@ -634,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")
@@ -663,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(" "))
@@ -676,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)
 
@@ -692,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
@@ -721,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")
@@ -730,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
@@ -746,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")
@@ -766,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")
 
@@ -1306,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