decidim-forms 0.29.1 → 0.30.0.rc1

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

@@ -37,29 +37,26 @@ shared_examples_for "add questions" do
 
   it "adds a few questions and separators to the questionnaire" do
     fields_body = ["This is the first question", "This is the second question", "This is the first title and description"]
+    click_on "Add question"
+    click_on "Add separator"
+    click_on "Add title and description"
+    click_on "Add question"
 
-    within "form.edit_questionnaire" do
-      click_on "Add question"
-      click_on "Add separator"
-      click_on "Add title and description"
-      click_on "Add question"
-
-      expect(page).to have_css(".questionnaire-question", count: 4)
+    expect(page).to have_css(".questionnaire-question", count: 4)
 
-      expand_all_questions
+    expand_all_questions
 
-      page.all(".questionnaire-question .collapsible").each_with_index do |field, idx|
-        within field do
-          fill_in find_nested_form_field_locator("body_en"), with: fields_body[idx]
-        end
+    page.all(".questionnaire-question .collapsible").each_with_index do |field, idx|
+      within field do
+        fill_in find_nested_form_field_locator("body_en"), with: fields_body[idx]
       end
-
-      click_on "Save"
     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='This is the first question']")
     expect(page).to have_css("input[value='This is the second question']")
@@ -68,59 +65,45 @@ shared_examples_for "add questions" do
   end
 
   it "adds a question with a rich text description" do
-    within "form.edit_questionnaire" do
-      click_on "Add question"
-      expand_all_questions
-
-      within ".questionnaire-question" do
-        fill_in find_nested_form_field_locator("body_en"), with: "Body"
+    click_on "Add question"
+    expand_all_questions
 
-        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
-      end
+    within ".questionnaire-question" do
+      fill_in find_nested_form_field_locator("body_en"), with: "Body"
 
-      click_on "Save"
+      fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
     end
 
+    click_on "Save"
+
     expect(page).to have_admin_callout("successfully")
 
-    component.update!(
-      step_settings: {
-        component.participatory_space.active_step.id => {
-          allow_answers: true
-        }
-      }
-    )
+    update_component_settings_or_attributes
 
     visit questionnaire_public_path
+    see_questionnaire_questions
 
     expect(page).to have_css("strong", text: "Superkalifragilistic description")
   end
 
   it "adds a title-and-description" do
-    within "form.edit_questionnaire" do
-      click_on "Add title and description"
-      expand_all_questions
+    click_on "Add title and description"
+    expand_all_questions
 
-      within ".questionnaire-question" do
-        fill_in find_nested_form_field_locator("body_en"), with: "Body"
+    within ".questionnaire-question" do
+      fill_in find_nested_form_field_locator("body_en"), with: "Body"
 
-        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
-      end
-
-      click_on "Save"
+      fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
     end
 
+    click_on "Save"
+
     expect(page).to have_admin_callout("successfully")
 
-    component.update!(
-      step_settings: {
-        component.participatory_space.active_step.id => {
-          allow_answers: true
-        }
-      }
-    )
+    update_component_settings_or_attributes
 
     visit questionnaire_public_path
+    see_questionnaire_questions
 
     expect(page).to have_css("strong", text: "Superkalifragilistic description")
   end
@@ -140,40 +123,38 @@ shared_examples_for "add questions" do
       ]
     ]
 
-    within "form.edit_questionnaire" do
-      click_on "Add question"
-      click_on "Add question"
-      expand_all_questions
+    click_on "Add question"
+    click_on "Add question"
+    expand_all_questions
 
-      page.all(".questionnaire-question").each_with_index do |question, idx|
-        within question do
-          fill_in find_nested_form_field_locator("body_en"), with: question_body[idx]
-        end
+    page.all(".questionnaire-question").each_with_index do |question, idx|
+      within question do
+        fill_in find_nested_form_field_locator("body_en"), with: question_body[idx]
       end
+    end
 
-      expect(page).to have_no_content "Add answer option"
+    expect(page).to have_no_content "Add answer option"
 
-      page.all(".questionnaire-question").each do |question|
-        within question do
-          select "Single option", from: "Type"
-          click_on "Add answer option"
-        end
+    page.all(".questionnaire-question").each do |question|
+      within question do
+        select "Single option", from: "Type"
+        click_on "Add answer option"
       end
+    end
 
-      page.all(".questionnaire-question").each_with_index do |question, question_idx|
-        question.all(".questionnaire-question-answer-option").each_with_index do |question_answer_option, answer_option_idx|
-          within question_answer_option do
-            fill_in find_nested_form_field_locator("body_en"), with: answer_options_body[question_idx][answer_option_idx]
-          end
+    page.all(".questionnaire-question").each_with_index do |question, question_idx|
+      question.all(".questionnaire-question-answer-option").each_with_index do |question_answer_option, answer_option_idx|
+        within question_answer_option do
+          fill_in find_nested_form_field_locator("body_en"), with: answer_options_body[question_idx][answer_option_idx]
         end
       end
-
-      click_on "Save"
     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='This is the first question']")
     expect(page).to have_css("input[value='This is the Q1 first option']")
@@ -278,11 +259,12 @@ shared_examples_for "add questions" do
     click_on "Add question"
     expand_all_questions
 
+    expect(page).to have_text("Type")
     select "Long answer", from: "Type"
     click_on "Save"
 
     expand_all_questions
-    expect(page).to have_select("Type", selected: "Long answer")
+    expect(page).to have_select("Type", selected: "Long answer", wait: 10)
   end
 
   it "does not preserve spurious answer options from previous type selections" do
@@ -300,6 +282,7 @@ shared_examples_for "add questions" do
     click_on "Save"
     expand_all_questions
 
+    expect(page).to have_text("Type")
     select "Single option", from: "Type"
 
     within ".questionnaire-question-answer-option:first-of-type" do
@@ -322,6 +305,7 @@ shared_examples_for "add questions" do
     click_on "Save"
     expand_all_questions
 
+    expect(page).to have_text("Type")
     select "Matrix (Single option)", from: "Type"
 
     within ".questionnaire-question-matrix-row:first-of-type" do
@@ -350,6 +334,7 @@ shared_examples_for "add questions" do
     click_on "Save"
     expand_all_questions
 
+    expect(page).to have_css(".questionnaire-question-answer-option")
     within ".questionnaire-question-answer-option:first-of-type" do
       expect(page).to have_nested_field("body_en", with: "Something")
     end
@@ -383,7 +368,6 @@ shared_examples_for "add questions" do
 
   it "allows switching translated field tabs after form failures" do
     click_on "Add question"
-    click_on "Save"
 
     expand_all_questions
 
@@ -405,20 +389,16 @@ shared_examples_for "add questions" do
     let(:single_option_string) { "Single option" }
 
     before do
-      visit questionnaire_edit_path
-
-      within "form.edit_questionnaire" do
-        click_on "Add question"
-
-        expand_all_questions
+      click_on "Add question"
 
-        within ".questionnaire-question" do
-          fill_in find_nested_form_field_locator("body_en"), with: "This is the first question"
-        end
+      expand_all_questions
 
-        expect(page).to have_no_content "Add answer option"
-        expect(page).to have_no_select("Maximum number of choices")
+      within ".questionnaire-question" do
+        fill_in find_nested_form_field_locator("body_en"), with: "This is the first question"
       end
+
+      expect(page).to have_no_content "Add answer option"
+      expect(page).to have_no_select("Maximum number of choices")
     end
 
     it "updates the free text option selector according to the selected question type" do
@@ -442,20 +422,16 @@ shared_examples_for "add questions" do
     let(:single_option_string) { "Matrix (Single option)" }
 
     before do
-      visit questionnaire_edit_path
-
-      within "form.edit_questionnaire" do
-        click_on "Add question"
-        expand_all_questions
-
-        within ".questionnaire-question" do
-          fill_in find_nested_form_field_locator("body_en"), with: "This is the first question"
-        end
+      click_on "Add question"
+      expand_all_questions
 
-        expect(page).to have_no_content "Add answer option"
-        expect(page).to have_no_content "Add row"
-        expect(page).to have_no_select("Maximum number of choices")
+      within ".questionnaire-question" do
+        fill_in find_nested_form_field_locator("body_en"), with: "This is the first question"
       end
+
+      expect(page).to have_no_content "Add answer option"
+      expect(page).to have_no_content "Add row"
+      expect(page).to have_no_select("Maximum number of choices")
     end
 
     it "updates the free text option selector according to the selected question type" do

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

@@ -19,7 +19,8 @@ shared_examples_for "update display conditions" do
     end
 
     before do
-      visit_questionnaire_edit_path_and_expand_all
+      click_on "Save"
+      visit_manage_questions_and_expand_all
     end
 
     it "the related form appears" do
@@ -59,35 +60,31 @@ shared_examples_for "update display conditions" do
 
       click_on "Save"
 
-      visit_questionnaire_edit_path_and_expand_all
+      visit_manage_questions_and_expand_all
 
       expect(page).to have_css(".questionnaire-question-display-condition", count: 0)
     end
 
     it "still removes the question even if previous editions rendered the conditions invalid" do
-      within "form.edit_questionnaire" do
-        expect(page).to have_css(".questionnaire-question", count: 2)
-
-        within ".questionnaire-question-display-condition:first-of-type" do
-          select condition_question.body["en"], from: "Question"
-          select "Includes text", from: "Condition"
-          fill_in find_nested_form_field_locator("condition_value_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-display-condition:first-of-type" do
+        select condition_question.body["en"], from: "Question"
+        select "Includes text", from: "Condition"
+        fill_in find_nested_form_field_locator("condition_value_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
 end