decidim-forms 0.28.5 → 0.29.0.rc1

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -20,18 +20,18 @@ shared_examples_for "update questions" do
           select "Long answer", from: "Type"
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
 
       visit_questionnaire_edit_path_and_expand_all
 
-      expect(page).to have_selector("input[value='Modified question']")
-      expect(page).not_to have_selector("input[value='This is the first question']")
-      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_mandatory[checked]")
-      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_max_characters[value='30']")
-      expect(page).to have_selector("select#questionnaire_questions_#{question.id}_question_type option[value='long_answer'][selected]")
+      expect(page).to have_css("input[value='Modified question']")
+      expect(page).to have_no_css("input[value='This is the first question']")
+      expect(page).to have_css("input#questionnaire_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questionnaire_questions_#{question.id}_max_characters[value='30']")
+      expect(page).to have_css("select#questionnaire_questions_#{question.id}_question_type option[value='long_answer'][selected]")
     end
 
     it "re-renders the form when the information is invalid and displays errors" do
@@ -47,49 +47,49 @@ shared_examples_for "update questions" do
           select "2", from: "Maximum number of choices"
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
-      expect(page).to have_content("cannot be blank", count: 5) # emtpy question, 2 empty default answer options, 2 empty default matrix rows
+      expect(page).to have_content("cannot be blank", count: 5) # empty question, 2 empty default answer options, 2 empty default matrix rows
       expect(page).to have_content("must be greater than or equal to 0", count: 1)
 
-      expect(page).to have_selector("input[value='']")
-      expect(page).not_to have_selector("input[value='This is the first question']")
-      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_mandatory[checked]")
-      expect(page).to have_selector("input#questionnaire_questions_#{question.id}_max_characters[value='-3']")
+      expect(page).to have_css("input[value='']")
+      expect(page).to have_no_css("input[value='This is the first question']")
+      expect(page).to have_css("input#questionnaire_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questionnaire_questions_#{question.id}_max_characters[value='-3']")
       expect(page).to have_select("Maximum number of choices", selected: "2")
-      expect(page).to have_selector("select#questionnaire_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
+      expect(page).to have_css("select#questionnaire_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
     end
 
     it "preserves deleted status across submission failures" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          click_button "Remove"
+          click_on "Remove"
         end
       end
 
-      click_button "Add question"
+      click_on "Add question"
 
-      click_button "Save"
+      click_on "Save"
 
-      expect(page).to have_selector(".questionnaire-question", count: 1)
+      expect(page).to have_css(".questionnaire-question", count: 1)
 
       within ".questionnaire-question" do
-        expect(page).to have_selector(".card-title", text: "#1")
-        expect(page).not_to have_button("Up")
+        expect(page).to have_css(".card-title", text: "#1")
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "removes the question" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          click_button "Remove"
+          click_on "Remove"
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
@@ -97,14 +97,14 @@ shared_examples_for "update questions" do
       visit questionnaire_edit_path
 
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 0)
+        expect(page).to have_css(".questionnaire-question", count: 0)
       end
     end
 
     it "cannot be moved up" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).not_to have_button("Up")
+          expect(page).to have_no_button("Up")
         end
       end
     end
@@ -112,7 +112,7 @@ shared_examples_for "update questions" do
     it "cannot be moved down" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).not_to have_button("Down")
+          expect(page).to have_no_button("Down")
         end
       end
     end
@@ -132,15 +132,15 @@ shared_examples_for "update questions" do
           fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified title and description"
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
 
       visit_questionnaire_edit_path_and_expand_all
 
-      expect(page).to have_selector("input[value='Modified title and description']")
-      expect(page).not_to have_selector("input[value='This is the first title and description']")
+      expect(page).to have_css("input[value='Modified title and description']")
+      expect(page).to have_no_css("input[value='This is the first title and description']")
     end
 
     it "re-renders the form when the information is invalid and displays errors" do
@@ -151,43 +151,43 @@ shared_examples_for "update questions" do
           fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
       expect(page).to have_content("cannot be blank", count: 1)
-      expect(page).to have_selector("input[value='']")
-      expect(page).not_to have_selector("input[value='This is the first title and description']")
+      expect(page).to have_css("input[value='']")
+      expect(page).to have_no_css("input[value='This is the first title and description']")
     end
 
     it "preserves deleted status across submission failures" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          click_button "Remove"
+          click_on "Remove"
         end
       end
 
-      click_button "Add question"
+      click_on "Add question"
 
-      click_button "Save"
+      click_on "Save"
 
-      expect(page).to have_selector(".questionnaire-question", count: 1)
+      expect(page).to have_css(".questionnaire-question", count: 1)
 
       within ".questionnaire-question" do
-        expect(page).to have_selector(".card-title", text: "#1")
-        expect(page).not_to have_button("Up")
+        expect(page).to have_css(".card-title", text: "#1")
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "removes the question" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          click_button "Remove"
+          click_on "Remove"
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
@@ -195,14 +195,14 @@ shared_examples_for "update questions" do
       visit questionnaire_edit_path
 
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 0)
+        expect(page).to have_css(".questionnaire-question", count: 0)
       end
     end
 
     it "cannot be moved up" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).not_to have_button("Up")
+          expect(page).to have_no_button("Up")
         end
       end
     end
@@ -210,7 +210,7 @@ shared_examples_for "update questions" do
     it "cannot be moved down" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).not_to have_button("Down")
+          expect(page).to have_no_button("Down")
         end
       end
     end
@@ -240,19 +240,19 @@ shared_examples_for "update questions" do
       expand_all_questions
 
       within ".questionnaire-question-answer-option:last-of-type" do
-        click_button "Remove"
+        click_on "Remove"
       end
 
-      click_button "Save"
+      click_on "Save"
 
       visit_questionnaire_edit_path_and_expand_all
 
-      expect(page).to have_selector(".questionnaire-question-answer-option", count: 2)
+      expect(page).to have_css(".questionnaire-question-answer-option", count: 2)
     end
 
     it "still removes the question even if previous editions rendered the options invalid" do
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 1)
+        expect(page).to have_css(".questionnaire-question", count: 1)
 
         expand_all_questions
 
@@ -261,10 +261,10 @@ shared_examples_for "update questions" do
         end
 
         within ".questionnaire-question" do
-          click_button "Remove", match: :first
+          click_on "Remove", match: :first
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
@@ -272,7 +272,7 @@ shared_examples_for "update questions" do
       visit_questionnaire_edit_path_and_expand_all
 
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 0)
+        expect(page).to have_css(".questionnaire-question", count: 0)
       end
     end
   end
@@ -305,32 +305,32 @@ shared_examples_for "update questions" do
 
     it "allows deleting matrix rows" do
       within ".questionnaire-question-matrix-row:last-of-type" do
-        click_button "Remove"
+        click_on "Remove"
       end
 
-      click_button "Save"
+      click_on "Save"
 
       visit_questionnaire_edit_path_and_expand_all
 
       within ".questionnaire-question:last-of-type" do
-        expect(page).to have_selector(".questionnaire-question-matrix-row", count: 2)
-        expect(page).to have_selector(".questionnaire-question-answer-option", count: 3)
+        expect(page).to have_css(".questionnaire-question-matrix-row", count: 2)
+        expect(page).to have_css(".questionnaire-question-answer-option", count: 3)
       end
     end
 
     it "still removes the question even if previous editions rendered the rows invalid" do
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 2)
+        expect(page).to have_css(".questionnaire-question", count: 2)
 
         within ".questionnaire-question-matrix-row:first-of-type" do
           fill_in find_nested_form_field_locator("body_en"), with: ""
         end
 
         within ".questionnaire-question:last-of-type" do
-          click_button "Remove", match: :first
+          click_on "Remove", match: :first
         end
 
-        click_button "Save"
+        click_on "Save"
       end
 
       expect(page).to have_admin_callout("successfully")
@@ -338,7 +338,7 @@ shared_examples_for "update questions" do
       visit_questionnaire_edit_path_and_expand_all
 
       within "form.edit_questionnaire" do
-        expect(page).to have_selector(".questionnaire-question", count: 1)
+        expect(page).to have_css(".questionnaire-question", count: 1)
       end
     end
   end
@@ -382,7 +382,7 @@ shared_examples_for "update questions" do
     context "when moving a question up" do
       before do
         within ".questionnaire-question:last-of-type" do
-          click_button "Up"
+          click_on "Up"
         end
       end
 
@@ -392,7 +392,7 @@ shared_examples_for "update questions" do
     context "when moving a question down" do
       before do
         within ".questionnaire-question:first-of-type" do
-          click_button "Down"
+          click_on "Down"
         end
       end
 
@@ -402,30 +402,30 @@ shared_examples_for "update questions" do
     describe "collapsible questions" do
       context "when clicking on Expand all button" do
         it "expands all questions" do
-          click_button "Expand all questions"
-          expect(page).to have_selector(".collapsible", visible: :all)
-          expect(page).to have_selector(".question--collapse .icon-collapse", count: questionnaire.questions.count)
+          click_on "Expand all questions"
+          expect(page).to have_css(".collapsible", visible: :all)
+          expect(page).to have_css(".question--collapse .icon-collapse", count: questionnaire.questions.count)
         end
       end
 
       context "when clicking on Collapse all button" do
         it "collapses all questions" do
-          click_button "Collapse all questions"
-          expect(page).not_to have_selector(".collapsible", visible: :visible)
-          expect(page).to have_selector(".question--collapse .icon-expand", count: questionnaire.questions.count)
+          click_on "Collapse all questions"
+          expect(page).to have_no_css(".collapsible", visible: :visible)
+          expect(page).to have_css(".question--collapse .icon-expand", count: questionnaire.questions.count)
         end
       end
 
       shared_examples_for "collapsing a question" do
         it "changes the toggle button" do
           within ".questionnaire-question:last-of-type" do
-            expect(page).to have_selector(".icon-expand")
+            expect(page).to have_css(".icon-expand")
           end
         end
 
         it "hides the question card section" do
           within ".questionnaire-question:last-of-type" do
-            expect(page).not_to have_selector(".collapsible", visible: :visible)
+            expect(page).to have_no_css(".collapsible", visible: :visible)
           end
         end
       end
@@ -433,12 +433,12 @@ shared_examples_for "update questions" do
       shared_examples_for "uncollapsing a question" do
         it "changes the toggle button" do
           within ".questionnaire-question:last-of-type" do
-            expect(page).to have_selector(".icon-collapse")
+            expect(page).to have_css(".icon-collapse")
           end
         end
 
         it "shows the question card section" do
-          expect(page).to have_selector(".collapsible", visible: :visible)
+          expect(page).to have_css(".collapsible", visible: :visible)
         end
       end
 
@@ -455,7 +455,7 @@ shared_examples_for "update questions" do
 
       context "when adding a new question" do
         before do
-          click_button "Add question"
+          click_on "Add question"
           expand_all_questions
 
           within ".questionnaire-question:last-of-type" do
@@ -468,8 +468,8 @@ shared_examples_for "update questions" do
 
       context "when submitting a new question with an error" do
         before do
-          click_button "Add question"
-          click_button "Save"
+          click_on "Add question"
+          click_on "Save"
 
           within ".questionnaire-question:last-of-type" do
             page.find(".question--collapse").click
@@ -484,14 +484,14 @@ shared_examples_for "update questions" do
           end
 
           within ".questionnaire-question:last-of-type" do
-            expect(page).to have_selector(".icon-collapse")
+            expect(page).to have_css(".icon-collapse")
           end
         end
       end
     end
 
     it "properly decides which button to show after adding/removing questions" do
-      click_button "Add question"
+      click_on "Add question"
       expand_all_questions
 
       expect(page.find(".questionnaire-question:nth-of-type(1)")).to look_like_first_question
@@ -499,7 +499,7 @@ shared_examples_for "update questions" do
       expect(page.find(".questionnaire-question:nth-of-type(3)")).to look_like_last_question
 
       within ".questionnaire-question:first-of-type" do
-        click_button "Remove"
+        click_on "Remove"
       end
 
       expect(page.all(".questionnaire-question").first).to look_like_first_question
@@ -508,41 +508,41 @@ shared_examples_for "update questions" do
 
     it "does not duplicate editors when adding new questions" do
       expect do
-        click_button "Add question"
+        click_on "Add question"
         expand_all_questions
       end.to change { page.all(".editor-toolbar").size }.by(1)
     end
 
     it "properly decides which button to show after adding/removing answer options" do
-      click_button "Add question"
+      click_on "Add question"
       expand_all_questions
 
       within ".questionnaire-question:last-of-type" do
         select "Single option", from: "Type"
 
         within ".questionnaire-question-answer-options-list" do
-          expect(page).not_to have_button("Remove")
+          expect(page).to have_no_button("Remove")
         end
 
-        click_button "Add answer option"
+        click_on "Add answer option"
 
         expect(page.all(".questionnaire-question-answer-option")).to all(have_button("Remove"))
 
         within ".questionnaire-question-answer-option:first-of-type" do
-          click_button "Remove"
+          click_on "Remove"
         end
 
         within ".questionnaire-question-answer-options-list" do
-          expect(page).not_to have_button("Remove")
+          expect(page).to have_no_button("Remove")
         end
       end
 
-      click_button "Save"
+      click_on "Save"
       expand_all_questions
 
       within ".questionnaire-question:last-of-type" do
         within ".questionnaire-question-answer-options-list" do
-          expect(page).not_to have_button("Remove")
+          expect(page).to have_no_button("Remove")
         end
       end
     end

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

@@ -35,7 +35,7 @@ shared_examples_for "manage questionnaires" do
 
     within "form.edit_questionnaire" do
       fill_in_i18n_editor(:questionnaire_description, "#questionnaire-description-tabs", new_description)
-      click_button "Save"
+      click_on "Save"
     end
 
     expect(page).to have_admin_callout("successfully")
@@ -63,16 +63,16 @@ shared_examples_for "manage questionnaires" do
     it "cannot modify questionnaire questions" do
       visit questionnaire_edit_path
 
-      expect(page).not_to have_content("Add question")
-      expect(page).not_to have_content("Remove")
+      expect(page).to have_no_content("Add question")
+      expect(page).to have_no_content("Remove")
 
       expand_all_questions
 
-      expect(page).to have_selector("input[value='This is the first question'][disabled]")
-      expect(page).to have_selector("select[id$=question_type][disabled]")
-      expect(page).to have_selector("select[id$=max_choices][disabled]")
-      expect(page).to have_selector("input[id$=max_characters][disabled]")
-      expect(page).to have_selector(".ProseMirror[contenteditable=false]")
+      expect(page).to have_css("input[value='This is the first question'][disabled]")
+      expect(page).to have_css("select[id$=question_type][disabled]")
+      expect(page).to have_css("select[id$=max_choices][disabled]")
+      expect(page).to have_css("input[id$=max_characters][disabled]")
+      expect(page).to have_css(".ProseMirror[contenteditable=false]")
     end
   end
 
@@ -100,7 +100,7 @@ shared_examples_for "manage questionnaires" do
 
   def within_add_display_condition
     within ".questionnaire-question:last-of-type" do
-      click_button "Add display condition"
+      click_on "Add display condition"
 
       within ".questionnaire-question-display-condition:last-of-type" do
         yield

data/lib/decidim/forms/user_answers_serializer.rb

@@ -42,7 +42,7 @@ module Decidim
         questionnaire_id = @answers.first&.decidim_questionnaire_id
         return {} unless questionnaire_id
 
-        questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id).order(:position)
+        questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id)
         return {} if questions.none?
 
         questions.each.inject({}) do |serialized, question|

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.28.5"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.28.5
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -41,34 +41,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -180,8 +194,6 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
-- config/locales/bn-BD.yml
-- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -270,6 +282,10 @@ files:
 - db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb
 - db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb
 - db/migrate/20210616153042_set_position_to_question_matrix_rows.rb
+- db/migrate/20240402092039_add_answer_options_counter_cache_to_questions.rb
+- db/migrate/20240402095253_add_matrix_row_counter_cache_to_questions.rb
+- db/migrate/20240416111953_add_display_conditions_counter_cache_to_questions.rb
+- db/migrate/20240416113926_add_display_conditions_for_other_questions_counter_cache_to_questions.rb
 - decidim-forms.gemspec
 - lib/decidim/api/answer_option_type.rb
 - lib/decidim/api/question_type.rb
@@ -296,7 +312,7 @@ files:
 - lib/decidim/forms/version.rb
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0-or-later
+- AGPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/
@@ -311,14 +327,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim forms

data/config/locales/bn-BD.yml

@@ -1 +0,0 @@
-bn:

data/config/locales/bs-BA.yml

@@ -1 +0,0 @@
-bs: