decidim-forms 0.29.6 → 0.30.0.rc1

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

@@ -7,68 +7,61 @@ shared_examples_for "update questions" do
     let!(:question) { create(:questionnaire_question, questionnaire:, body:) }
 
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "modifies the question when the information is valid" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified question"
-          fill_in "questionnaire_questions_#{question.id}_max_characters", with: 30
-          check "Mandatory"
-          select "Long answer", from: "Type"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: "Modified question"
+        fill_in "questions_questions_#{question.id}_max_characters", with: 30
+        check "Mandatory"
+        select "Long answer", from: "Type"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       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]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_max_characters[value='30']")
+      expect(page).to have_css("select#questions_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
       expand_all_questions
 
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_content("Statement*")
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
-          fill_in "questionnaire_questions_#{question.id}_max_characters", with: -3
-          check "Mandatory"
-          select "Matrix (Multiple option)", from: "Type"
-          select "2", from: "Maximum number of choices"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        expect(page).to have_content("Statement*")
+        fill_in "questions_questions_#{question.id}_body_en", with: ""
+        fill_in "questions_questions_#{question.id}_max_characters", with: -3
+        check "Mandatory"
+        select "Matrix (Multiple option)", from: "Type"
+        select "2", from: "Maximum number of choices"
       end
 
-      expand_all_questions
+      click_on "Save"
+      click_on "Expand all questions"
 
       expect(page).to have_admin_callout("There was a problem saving")
-      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("cannot be blank", count: 5)
       expect(page).to have_content("must be greater than or equal to 0", count: 1)
 
       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_css("input#questions_questions_#{question.id}_mandatory[checked]")
+      expect(page).to have_css("input#questions_questions_#{question.id}_max_characters[value='-3']")
+      expect(page).to have_css("select#questions_questions_#{question.id}_question_type option[value='matrix_multiple'][selected]")
       expect(page).to have_select("Maximum number of choices", selected: "2")
-      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_on "Remove"
-        end
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
       click_on "Add question"
@@ -84,36 +77,28 @@ shared_examples_for "update questions" do
     end
 
     it "removes the question" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit questionnaire_edit_path
+      click_on "Manage questions"
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
 
     it "cannot be moved up" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "cannot be moved down" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Down")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Down")
       end
     end
   end
@@ -122,22 +107,20 @@ shared_examples_for "update questions" do
     let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire:, body: title_and_description_body) }
 
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "modifies the question when the information is valid" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified title and description"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: "Modified title and description"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       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']")
@@ -146,14 +129,12 @@ shared_examples_for "update questions" do
     it "re-renders the form when the information is invalid and displays errors" do
       expand_all_questions
 
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        fill_in "questions_questions_#{question.id}_body_en", with: ""
       end
 
+      click_on "Save"
+
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
@@ -163,10 +144,8 @@ shared_examples_for "update questions" do
     end
 
     it "preserves deleted status across submission failures" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
       click_on "Add question"
@@ -182,36 +161,28 @@ shared_examples_for "update questions" do
     end
 
     it "removes the question" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          click_on "Remove"
-        end
-
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove"
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit questionnaire_edit_path
+      click_on "Manage questions"
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
 
     it "cannot be moved up" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Up")
       end
     end
 
     it "cannot be moved down" do
-      within "form.edit_questionnaire" do
-        within ".questionnaire-question" do
-          expect(page).to have_no_button("Down")
-        end
+      within ".questionnaire-question" do
+        expect(page).to have_no_button("Down")
       end
     end
   end
@@ -233,7 +204,8 @@ shared_examples_for "update questions" do
     end
 
     before do
-      visit questionnaire_edit_path
+      click_on "Save"
+      click_on "Manage questions"
     end
 
     it "allows deleting answer options" do
@@ -245,35 +217,31 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       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_css(".questionnaire-question", count: 1)
-
-        expand_all_questions
+      expect(page).to have_css(".questionnaire-question", count: 1)
 
-        within ".questionnaire-question-answer-option:first-of-type" do
-          fill_in find_nested_form_field_locator("body_en"), with: ""
-        end
+      expand_all_questions
 
-        within ".questionnaire-question" do
-          click_on "Remove", match: :first
-        end
+      within ".questionnaire-question-answer-option:first-of-type" do
+        fill_in find_nested_form_field_locator("body_en"), with: ""
+      end
 
-        click_on "Save"
+      within ".questionnaire-question" do
+        click_on "Remove", match: :first
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 0)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 0)
     end
   end
 
@@ -300,7 +268,8 @@ shared_examples_for "update questions" do
     end
 
     before do
-      visit_questionnaire_edit_path_and_expand_all
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "allows deleting matrix rows" do
@@ -310,7 +279,7 @@ shared_examples_for "update questions" do
 
       click_on "Save"
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       within ".questionnaire-question:last-of-type" do
         expect(page).to have_css(".questionnaire-question-matrix-row", count: 2)
@@ -319,27 +288,23 @@ shared_examples_for "update questions" do
     end
 
     it "still removes the question even if previous editions rendered the rows invalid" do
-      within "form.edit_questionnaire" do
-        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
+      expect(page).to have_css(".questionnaire-question", count: 2)
 
-        within ".questionnaire-question:last-of-type" do
-          click_on "Remove", match: :first
-        end
+      within ".questionnaire-question-matrix-row:first-of-type" do
+        fill_in find_nested_form_field_locator("body_en"), with: ""
+      end
 
-        click_on "Save"
+      within ".questionnaire-question:last-of-type" do
+        click_on "Remove", match: :first
       end
 
+      click_on "Save"
+
       expect(page).to have_admin_callout("successfully")
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 1)
-      end
+      expect(page).to have_css(".questionnaire-question", count: 1)
     end
   end
 
@@ -352,10 +317,6 @@ shared_examples_for "update questions" do
       create(:questionnaire_question, questionnaire:, body: second_body, position: 1)
     end
 
-    let!(:question3) do
-      create(:questionnaire_question, questionnaire:, body: third_body, position: 2)
-    end
-
     let(:first_body) do
       { en: "First", ca: "Primera", es: "Primera" }
     end
@@ -364,13 +325,9 @@ shared_examples_for "update questions" do
       { en: "Second", ca: "Segona", es: "Segunda" }
     end
 
-    let(:third_body) do
-      { en: "Third", ca: "Tercera", es: "Tercera" }
-    end
-
     before do
-      visit questionnaire_edit_path
-      expand_all_questions
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     shared_examples_for "switching questions order" do
@@ -387,6 +344,26 @@ shared_examples_for "update questions" do
       end
     end
 
+    context "when moving a question up" do
+      before do
+        within ".questionnaire-question:last-of-type" do
+          click_on "Up"
+        end
+      end
+
+      it_behaves_like "switching questions order"
+    end
+
+    context "when moving a question down" do
+      before do
+        within ".questionnaire-question:first-of-type" do
+          click_on "Down"
+        end
+      end
+
+      it_behaves_like "switching questions order"
+    end
+
     describe "collapsible questions" do
       context "when clicking on Expand all button" do
         it "expands all questions" do
@@ -482,37 +459,16 @@ shared_examples_for "update questions" do
       click_on "Add question"
       expand_all_questions
 
-      question_cards = page.all(".questionnaire-question")
-      expect(question_cards.size).to eq(4)
-
-      within question_cards[1] do
-        expect(find("input[name*='[body_en]']").value).to eq("Second")
-      end
-      within question_cards[2] do
-        expect(find("input[name*='[body_en]']").value).to eq("Third")
-      end
+      expect(page.find(".questionnaire-question:nth-of-type(1)")).to look_like_first_question
+      expect(page.find(".questionnaire-question:nth-of-type(2)")).to look_like_intermediate_question
+      expect(page.find(".questionnaire-question:nth-of-type(3)")).to look_like_last_question
 
       within ".questionnaire-question:first-of-type" do
         click_on "Remove"
       end
 
-      remaining_cards = page.all(".questionnaire-question")
-      expect(remaining_cards.size).to eq(3)
-
-      # Check that the first question is now what was previously the second
-      within remaining_cards.first do
-        expect(find("input[name*='[body_en]']").value).to eq("Second")
-      end
-
-      # Check that the second question is now what was previously the third
-      within remaining_cards[1] do
-        expect(find("input[name*='[body_en]']").value).to eq("Third")
-      end
-
-      # The last question should be the new empty question
-      within remaining_cards.last do
-        expect(find("input[name*='[body_en]']").value).to eq("")
-      end
+      expect(page.all(".questionnaire-question").first).to look_like_first_question
+      expect(page.all(".questionnaire-question").last).to look_like_last_question
     end
 
     it "does not duplicate editors when adding new questions" do
@@ -556,94 +512,6 @@ shared_examples_for "update questions" do
       end
     end
 
-    context "when reordering questions with drag and drop", :js do
-      before do
-        expand_all_questions
-      end
-
-      it "allows moving questions using drag and drop" do
-        question_cards = all(".questionnaire-question")
-
-        # Verify initial order by checking the body field values
-        within question_cards[0] do
-          expect(find("input[name*='[body_en]']").value).to eq("First")
-        end
-        within question_cards[1] do
-          expect(find("input[name*='[body_en]']").value).to eq("Second")
-        end
-        within question_cards[2] do
-          expect(find("input[name*='[body_en]']").value).to eq("Third")
-        end
-
-        # JavaScript to simulate drag and drop.
-        page.execute_script(<<~JS)
-          var questions = document.querySelectorAll('.questionnaire-question');
-          var container = questions[0].parentNode;
-          var second = questions[1];
-          var first = questions[0];
-
-          // Move second question before first
-          container.insertBefore(second, first);
-
-          // Update position values
-          var updatedQuestions = container.querySelectorAll('.questionnaire-question');
-          updatedQuestions.forEach(function(question, index) {
-            var positionInput = question.querySelector('input[name$="[position]"]');
-            if (positionInput) positionInput.value = index;
-          });
-        JS
-
-        sleep 0.5
-
-        question_cards = all(".questionnaire-question")
-        within question_cards[0] do
-          expect(find("input[name*='[body_en]']").value).to eq("Second")
-        end
-        within question_cards[1] do
-          expect(find("input[name*='[body_en]']").value).to eq("First")
-        end
-        within question_cards[2] do
-          expect(find("input[name*='[body_en]']").value).to eq("Third")
-        end
-      end
-
-      it "persists drag and drop changes when saving" do
-        # Move second question to last position
-        page.execute_script(<<~JS)
-          var questions = document.querySelectorAll('.questionnaire-question');
-          var container = questions[0].parentNode;
-          var second = questions[1];
-
-          container.appendChild(second);
-
-          // Update the positions of questions
-          var updatedQuestions = container.querySelectorAll('.questionnaire-question');
-          updatedQuestions.forEach(function(question, index) {
-            var positionInput = question.querySelector('input[name$="[position]"]');
-            if (positionInput) positionInput.value = index;
-          });
-        JS
-
-        sleep 0.5
-
-        click_on "Save"
-        expect(page).to have_admin_callout("successfully")
-
-        visit_manage_questions_and_expand_all
-
-        question_cards = all(".questionnaire-question")
-        within question_cards[0] do
-          expect(find("input[name*='[body_en]']").value).to eq("First")
-        end
-        within question_cards[1] do
-          expect(find("input[name*='[body_en]']").value).to eq("Third")
-        end
-        within question_cards[2] do
-          expect(find("input[name*='[body_en]']").value).to eq("Second")
-        end
-      end
-    end
-
     private
 
     def look_like_first_question

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

@@ -24,30 +24,9 @@ shared_examples_for "manage questionnaires" do
     }
   end
 
-  it "updates the questionnaire" do
-    visit questionnaire_edit_path
-
-    new_description = {
-      en: "<p>New description</p>",
-      ca: "<p>Nova descripció</p>",
-      es: "<p>Nueva descripción</p>"
-    }
-
-    within "form.edit_questionnaire" do
-      fill_in_i18n_editor(:questionnaire_description, "#questionnaire-description-tabs", new_description)
-      click_on "Save"
-    end
-
-    expect(page).to have_admin_callout("successfully")
-
-    visit questionnaire_public_path
-
-    expect(page).to have_content("New description")
-  end
-
   context "when the questionnaire is not already answered" do
     before do
-      visit questionnaire_edit_path
+      visit manage_questions_path
     end
 
     it_behaves_like "add questions"
@@ -61,7 +40,7 @@ shared_examples_for "manage questionnaires" do
     let!(:answer) { create(:answer, questionnaire:, question:) }
 
     it "cannot modify questionnaire questions" do
-      visit questionnaire_edit_path
+      visit manage_questions_path
 
       expect(page).to have_no_content("Add question")
       expect(page).to have_no_content("Remove")
@@ -112,13 +91,8 @@ shared_examples_for "manage questionnaires" do
     find(".button.expand-all").click
   end
 
-  def visit_questionnaire_edit_path_and_expand_all
-    visit questionnaire_edit_path
-    expand_all_questions
-  end
-
   def visit_manage_questions_and_expand_all
-    visit questionnaire_edit_path
+    click_on "Manage questions"
     expand_all_questions
   end
 end

data/lib/decidim/forms/version.rb

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

data/lib/decidim/forms.rb

@@ -14,6 +14,5 @@ module Decidim
 
   module Exporters
     autoload :FormPDF, "decidim/exporters/form_pdf"
-    autoload :FormPDFControllerHelper, "decidim/exporters/form_pdf_controller_helper"
   end
 end