decidim-forms 0.27.4 → 0.28.0.rc5

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

@@ -5,13 +5,13 @@ require "spec_helper"
 shared_examples_for "manage questionnaire answers" do
   let(:first_type) { "short_answer" }
   let!(:first) do
-    create :questionnaire_question, questionnaire: questionnaire, position: 1, question_type: first_type
+    create :questionnaire_question, questionnaire:, position: 1, question_type: first_type
   end
   let!(:second) do
-    create :questionnaire_question, questionnaire: questionnaire, position: 2, question_type: "single_option"
+    create :questionnaire_question, questionnaire:, position: 2, question_type: "single_option"
   end
   let!(:third) do
-    create :questionnaire_question, questionnaire: questionnaire, position: 3, question_type: "files"
+    create :questionnaire_question, questionnaire:, position: 3, question_type: "files"
   end
   let(:questions) do
     [first, second, third]
@@ -25,10 +25,10 @@ shared_examples_for "manage questionnaire answers" do
   end
 
   context "when there are answers" do
-    let!(:answer1) { create :answer, questionnaire: questionnaire, question: first }
-    let!(:answer2) { create :answer, body: "second answer", questionnaire: questionnaire, question: first }
-    let!(:answer3) { create :answer, questionnaire: questionnaire, question: second }
-    let!(:file_answer) { create :answer, :with_attachments, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
+    let!(:answer1) { create :answer, questionnaire:, question: first }
+    let!(:answer2) { create :answer, body: "second answer", questionnaire:, question: first }
+    let!(:answer3) { create :answer, questionnaire:, question: second }
+    let!(:file_answer) { create :answer, :with_attachments, questionnaire:, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
 
     it "shows the answer admin link" do
       visit questionnaire_edit_path
@@ -76,25 +76,25 @@ shared_examples_for "manage questionnaire answers" do
 
       context "when multiple answer choice" do
         let(:first_type) { "multiple_option" }
-        let!(:answer1) { create :answer, questionnaire: questionnaire, question: first, body: nil }
+        let!(:answer1) { create :answer, questionnaire:, question: first, body: nil }
         let!(:answer_option) { create :answer_option, question: first }
-        let!(:answer_choice) { create :answer_choice, answer: answer1, answer_option: answer_option, body: translated(answer_option.body, locale: I18n.locale) }
-
-        before do
-          find_all("a.action-icon.action-icon--eye").first.click
-        end
+        let!(:answer_choice) { create :answer_choice, answer: answer1, answer_option:, body: translated(answer_option.body, locale: I18n.locale) }
 
         it "shows the answers page with custom body" do
-          within "#answers" do
-            expect(page).to have_css("dt", text: translated(first.body))
-            expect(page).to have_css("li", text: translated(answer_option.body))
+          new_window = window_opened_by { find_all("a.action-icon.action-icon--eye").first.click }
+
+          page.within_window(new_window) do
+            within "#answers" do
+              expect(page).to have_css("dt", text: translated(first.body))
+              expect(page).to have_css("li", text: translated(answer_option.body))
+            end
           end
         end
       end
     end
 
     context "and managing individual answer page" do
-      let!(:answer11) { create :answer, questionnaire: questionnaire, body: "", user: answer1.user, question: second }
+      let!(:answer11) { create :answer, questionnaire:, body: "", user: answer1.user, question: second }
 
       before do
         visit questionnaire_edit_path
@@ -133,7 +133,7 @@ shared_examples_for "manage questionnaire answers" do
       end
 
       context "when the file answer does not have a title for the attachment" do
-        let!(:file_answer) { create :answer, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
+        let!(:file_answer) { create :answer, questionnaire:, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
 
         before do
           create :attachment, :with_image, attached_to: file_answer, title: {}, description: {}

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

@@ -14,18 +14,18 @@ shared_examples_for "add display conditions" do
     end
 
     context "when questionnaire has only one question" do
-      let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, body: body, question_type: "short_answer") }
+      let!(:question) { create(:questionnaire_question, questionnaire:, body:, question_type: "short_answer") }
 
       before do
         visit_questionnaire_edit_path_and_expand_all
       end
 
-      it "doesn't display an add display condition button" do
-        expect(page).to have_no_button("Add display condition")
+      it "does not display an add display condition button" do
+        expect(page).not_to have_button("Add display condition")
       end
 
       context "when creating a new question" do
-        it "disables the add display condition button if the question hasn't been saved" do
+        it "disables the add display condition button if the question has not been saved" do
           within "form.edit_questionnaire" do
             click_button "Add question"
             expand_all_questions
@@ -40,21 +40,21 @@ shared_examples_for "add display conditions" do
       let!(:question_short_answer) do
         create(:questionnaire_question,
                position: 0,
-               questionnaire: questionnaire,
+               questionnaire:,
                body: Decidim::Faker::Localized.sentence,
                question_type: "short_answer")
       end
       let!(:question_long_answer) do
         create(:questionnaire_question,
                position: 1,
-               questionnaire: questionnaire,
+               questionnaire:,
                body: Decidim::Faker::Localized.sentence,
                question_type: "long_answer")
       end
       let!(:question_single_option) do
         create(:questionnaire_question,
                position: 2,
-               questionnaire: questionnaire,
+               questionnaire:,
                body: Decidim::Faker::Localized.sentence,
                question_type: "single_option",
                options: answer_options)
@@ -62,7 +62,7 @@ shared_examples_for "add display conditions" do
       let!(:question_multiple_option) do
         create(:questionnaire_question,
                position: 3,
-               questionnaire: questionnaire,
+               questionnaire:,
                body: Decidim::Faker::Localized.sentence,
                question_type: "multiple_option",
                options: answer_options)
@@ -85,14 +85,14 @@ shared_examples_for "add display conditions" do
               select question_single_option.body["en"], from: "Question"
               select "Answered", from: "Condition"
 
-              expect(page).to have_no_select("Answer option")
-              expect(page).to have_no_css("[id$=condition_value_en]", visible: :visible)
+              expect(page).not_to have_select("Answer option")
+              expect(page).not_to have_css("[id$=condition_value_en]", visible: :visible)
 
               select question_single_option.body["en"], from: "Question"
               select "Equal", from: "Condition"
 
               expect(page).to have_select("Answer option")
-              expect(page).to have_no_css("[id$=condition_value_en]", visible: :visible)
+              expect(page).not_to have_css("[id$=condition_value_en]", visible: :visible)
             end
           end
         end
@@ -101,7 +101,7 @@ shared_examples_for "add display conditions" do
           within_add_display_condition do
             options = questions.map { |question| question["body"]["en"] }
             options << "Select a question"
-            expect(page).to have_select("Question", options: options)
+            expect(page).to have_select("Question", options:)
 
             within "select[id$=decidim_condition_question_id]" do
               elements = page.all("option[data-type]")
@@ -149,7 +149,7 @@ shared_examples_for "add display conditions" do
             options = answer_options.map { |option| option["body"]["en"] }
             options << "Select answer option"
 
-            expect(page).to have_select("Answer option", options: options, wait: 5)
+            expect(page).to have_select("Answer option", options:, wait: 5)
           end
         end
 
@@ -164,7 +164,7 @@ shared_examples_for "add display conditions" do
         it "loads a mandatory field with false value" do
           within_add_display_condition do
             expect(page).to have_selector("[id$=mandatory]")
-            expect(page).to have_no_selector("[id$=mandatory][checked]")
+            expect(page).not_to have_selector("[id$=mandatory][checked]")
           end
         end
 

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

@@ -3,6 +3,38 @@
 require "spec_helper"
 
 shared_examples_for "add questions" do
+  shared_examples_for "updating the max choices selector according to the configured options" do
+    it "updates them" do
+      expect(page).not_to have_select("Maximum number of choices")
+
+      select "Multiple option", from: "Type"
+      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
+
+      click_button "Add answer option"
+      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
+
+      click_button "Add answer option"
+      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3 4))
+
+      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
+      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
+
+      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
+      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
+
+      click_button "Add question"
+      expand_all_questions
+
+      within(".questionnaire-question:last-of-type") do
+        select multiple_option_string, from: "Type"
+        expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
+
+        select single_option_string, from: "Type"
+        expect(page).not_to have_select("Maximum number of choices")
+      end
+    end
+  end
+
   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"]
 
@@ -43,7 +75,7 @@ shared_examples_for "add questions" do
       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: "<strong>Superkalifragilistic description</strong>"
+        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
       end
 
       click_button "Save"
@@ -72,7 +104,7 @@ shared_examples_for "add questions" do
       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: "<strong>Superkalifragilistic description</strong>"
+        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<p>\n<strong>Superkalifragilistic description</strong>\n</p>"
       end
 
       click_button "Save"
@@ -119,7 +151,7 @@ shared_examples_for "add questions" do
         end
       end
 
-      expect(page).to have_no_content "Add answer option"
+      expect(page).not_to have_content "Add answer option"
 
       page.all(".questionnaire-question").each do |question|
         within question do
@@ -158,24 +190,24 @@ shared_examples_for "add questions" do
     expand_all_questions
 
     select "Long answer", from: "Type"
-    expect(page).to have_no_selector(".questionnaire-question-answer-option")
-    expect(page).to have_no_selector(".questionnaire-question-matrix-row")
+    expect(page).not_to have_selector(".questionnaire-question-answer-option")
+    expect(page).not_to have_selector(".questionnaire-question-matrix-row")
 
     select "Single option", from: "Type"
     expect(page).to have_selector(".questionnaire-question-answer-option", count: 2)
-    expect(page).to have_no_selector(".questionnaire-question-matrix-row")
+    expect(page).not_to have_selector(".questionnaire-question-matrix-row")
 
     select "Multiple option", from: "Type"
     expect(page).to have_selector(".questionnaire-question-answer-option", count: 2)
-    expect(page).to have_no_selector(".questionnaire-question-matrix-row")
+    expect(page).not_to have_selector(".questionnaire-question-matrix-row")
 
     select "Matrix (Multiple option)", from: "Type"
     expect(page).to have_selector(".questionnaire-question-answer-option", count: 2)
     expect(page).to have_selector(".questionnaire-question-matrix-row", count: 2)
 
     select "Short answer", from: "Type"
-    expect(page).to have_no_selector(".questionnaire-question-answer-option")
-    expect(page).to have_no_selector(".questionnaire-question-matrix-row")
+    expect(page).not_to have_selector(".questionnaire-question-answer-option")
+    expect(page).not_to have_selector(".questionnaire-question-matrix-row")
 
     select "Matrix (Single option)", from: "Type"
     expect(page).to have_selector(".questionnaire-question-answer-option", count: 2)
@@ -363,12 +395,15 @@ shared_examples_for "add questions" do
       click_link "English", match: :first
 
       expect(page).to have_nested_field("body_en", with: "Bye")
-      expect(page).to have_no_selector(nested_form_field_selector("body_ca"))
-      expect(page).to have_no_content("Adeu")
+      expect(page).not_to have_selector(nested_form_field_selector("body_ca"))
+      expect(page).not_to have_content("Adeu")
     end
   end
 
   context "when adding a multiple option question" do
+    let(:multiple_option_string) { "Multiple option" }
+    let(:single_option_string) { "Single option" }
+
     before do
       visit questionnaire_edit_path
 
@@ -381,56 +416,31 @@ shared_examples_for "add questions" 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")
+        expect(page).not_to have_content "Add answer option"
+        expect(page).not_to have_select("Maximum number of choices")
       end
     end
 
     it "updates the free text option selector according to the selected question type" do
-      expect(page).to have_no_selector("input[type=checkbox][id$=_free_text]")
+      expect(page).not_to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Multiple option", from: "Type"
       expect(page).to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Short answer", from: "Type"
-      expect(page).to have_no_selector("input[type=checkbox][id$=_free_text]")
+      expect(page).not_to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Single option", from: "Type"
       expect(page).to have_selector("input[type=checkbox][id$=_free_text]")
     end
 
-    it "updates the max choices selector according to the configured options" do
-      expect(page).to have_no_select("Maximum number of choices")
-
-      select "Multiple option", from: "Type"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-      click_button "Add answer option"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
-
-      click_button "Add answer option"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3 4))
-
-      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
-
-      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-      click_button "Add question"
-      expand_all_questions
-
-      within(".questionnaire-question:last-of-type") do
-        select "Multiple option", from: "Type"
-        expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-        select "Single option", from: "Type"
-        expect(page).to have_no_select("Maximum number of choices")
-      end
-    end
+    it_behaves_like "updating the max choices selector according to the configured options"
   end
 
   context "when adding a matrix question" do
+    let(:multiple_option_string) { "Matrix (Multiple option)" }
+    let(:single_option_string) { "Matrix (Single option)" }
+
     before do
       visit questionnaire_edit_path
 
@@ -442,53 +452,25 @@ shared_examples_for "add questions" 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")
+        expect(page).not_to have_content "Add answer option"
+        expect(page).not_to have_content "Add row"
+        expect(page).not_to have_select("Maximum number of choices")
       end
     end
 
     it "updates the free text option selector according to the selected question type" do
-      expect(page).to have_no_selector("input[type=checkbox][id$=_free_text]")
+      expect(page).not_to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Matrix (Multiple option)", from: "Type"
       expect(page).to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Short answer", from: "Type"
-      expect(page).to have_no_selector("input[type=checkbox][id$=_free_text]")
+      expect(page).not_to have_selector("input[type=checkbox][id$=_free_text]")
 
       select "Matrix (Single option)", from: "Type"
       expect(page).to have_selector("input[type=checkbox][id$=_free_text]")
     end
 
-    it "updates the max choices selector according to the configured options" do
-      expect(page).to have_no_select("Maximum number of choices")
-
-      select "Matrix (Multiple option)", from: "Type"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-      click_button "Add answer option"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
-
-      click_button "Add answer option"
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3 4))
-
-      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2 3))
-
-      within(".questionnaire-question-answer-option:last-of-type") { click_button "Remove" }
-      expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-      click_button "Add question"
-      expand_all_questions
-
-      within(".questionnaire-question:last-of-type") do
-        select "Matrix (Multiple option)", from: "Type"
-        expect(page).to have_select("Maximum number of choices", options: %w(Any 2))
-
-        select "Matrix (Single option)", from: "Type"
-        expect(page).to have_no_select("Maximum number of choices")
-      end
-    end
+    it_behaves_like "updating the max choices selector according to the configured options"
   end
 end

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

@@ -5,17 +5,17 @@ require "spec_helper"
 shared_examples_for "update display conditions" do
   context "when loading a saved display condition" do
     let!(:condition_question_type) { "short_answer" }
-    let!(:condition_question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: condition_question_type, position: 1) }
-    let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, question_type: "short_answer", position: 2) }
+    let!(:condition_question) { create(:questionnaire_question, questionnaire:, question_type: condition_question_type, position: 1) }
+    let!(:question) { create(:questionnaire_question, questionnaire:, question_type: "short_answer", position: 2) }
     let!(:condition_type) { :answered }
     let!(:answer_option) { nil }
 
     let!(:display_condition) do
       create(:display_condition,
-             question: question,
-             condition_question: condition_question,
-             condition_type: condition_type,
-             answer_option: answer_option)
+             question:,
+             condition_question:,
+             condition_type:,
+             answer_option:)
     end
 
     before do

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

@@ -4,7 +4,7 @@ require "spec_helper"
 
 shared_examples_for "update questions" do
   context "when a questionnaire has an existing question" do
-    let!(:question) { create(:questionnaire_question, questionnaire: questionnaire, body: body) }
+    let!(:question) { create(:questionnaire_question, questionnaire:, body:) }
 
     before do
       visit questionnaire_edit_path
@@ -28,7 +28,7 @@ shared_examples_for "update questions" do
       visit_questionnaire_edit_path_and_expand_all
 
       expect(page).to have_selector("input[value='Modified question']")
-      expect(page).to have_no_selector("input[value='This is the first 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]")
@@ -53,11 +53,11 @@ shared_examples_for "update questions" do
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
-      expect(page).to have_content("can't 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) # emtpy 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).to have_no_selector("input[value='This is the first 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='-3']")
       expect(page).to have_select("Maximum number of choices", selected: "2")
@@ -79,7 +79,7 @@ shared_examples_for "update questions" do
 
       within ".questionnaire-question" do
         expect(page).to have_selector(".card-title", text: "#1")
-        expect(page).to have_no_button("Up")
+        expect(page).not_to have_button("Up")
       end
     end
 
@@ -104,7 +104,7 @@ shared_examples_for "update questions" do
     it "cannot be moved up" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
+          expect(page).not_to have_button("Up")
         end
       end
     end
@@ -112,14 +112,14 @@ shared_examples_for "update questions" do
     it "cannot be moved down" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).to have_no_button("Down")
+          expect(page).not_to have_button("Down")
         end
       end
     end
   end
 
   context "when a questionnaire has a title and description" do
-    let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire: questionnaire, body: title_and_description_body) }
+    let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire:, body: title_and_description_body) }
 
     before do
       visit questionnaire_edit_path
@@ -140,7 +140,7 @@ shared_examples_for "update questions" do
       visit_questionnaire_edit_path_and_expand_all
 
       expect(page).to have_selector("input[value='Modified title and description']")
-      expect(page).to have_no_selector("input[value='This is the first title and description']")
+      expect(page).not_to have_selector("input[value='This is the first title and description']")
     end
 
     it "re-renders the form when the information is invalid and displays errors" do
@@ -157,9 +157,9 @@ shared_examples_for "update questions" do
       expand_all_questions
 
       expect(page).to have_admin_callout("There was a problem saving")
-      expect(page).to have_content("can't be blank", count: 1)
+      expect(page).to have_content("cannot be blank", count: 1)
       expect(page).to have_selector("input[value='']")
-      expect(page).to have_no_selector("input[value='This is the first title and description']")
+      expect(page).not_to have_selector("input[value='This is the first title and description']")
     end
 
     it "preserves deleted status across submission failures" do
@@ -177,7 +177,7 @@ shared_examples_for "update questions" do
 
       within ".questionnaire-question" do
         expect(page).to have_selector(".card-title", text: "#1")
-        expect(page).to have_no_button("Up")
+        expect(page).not_to have_button("Up")
       end
     end
 
@@ -202,7 +202,7 @@ shared_examples_for "update questions" do
     it "cannot be moved up" do
       within "form.edit_questionnaire" do
         within ".questionnaire-question" do
-          expect(page).to have_no_button("Up")
+          expect(page).not_to have_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).to have_no_button("Down")
+          expect(page).not_to have_button("Down")
         end
       end
     end
@@ -220,8 +220,8 @@ shared_examples_for "update questions" do
     let!(:question) do
       create(
         :questionnaire_question,
-        questionnaire: questionnaire,
-        body: body,
+        questionnaire:,
+        body:,
         question_type: "single_option",
         options: [
           { "body" => { "en" => "cacatua" } },
@@ -278,12 +278,12 @@ shared_examples_for "update questions" do
   end
 
   context "when a questionnaire has an existing question with matrix rows" do
-    let!(:other_question) { create(:questionnaire_question, questionnaire: questionnaire, position: 1) }
+    let!(:other_question) { create(:questionnaire_question, questionnaire:, position: 1) }
     let!(:question) do
       create(
         :questionnaire_question,
-        questionnaire: questionnaire,
-        body: body,
+        questionnaire:,
+        body:,
         question_type: "matrix_single",
         position: 2,
         options: [
@@ -345,11 +345,11 @@ shared_examples_for "update questions" do
 
   context "when a questionnaire has multiple existing questions" do
     let!(:question1) do
-      create(:questionnaire_question, questionnaire: questionnaire, body: first_body, position: 0)
+      create(:questionnaire_question, questionnaire:, body: first_body, position: 0)
     end
 
     let!(:question2) do
-      create(:questionnaire_question, questionnaire: questionnaire, body: second_body, position: 1)
+      create(:questionnaire_question, questionnaire:, body: second_body, position: 1)
     end
 
     let(:first_body) do
@@ -510,7 +510,7 @@ shared_examples_for "update questions" do
       expect do
         click_button "Add question"
         expand_all_questions
-      end.to change { page.all(".ql-toolbar").size }.by(1)
+      end.to change { page.all(".editor-toolbar").size }.by(1)
     end
 
     it "properly decides which button to show after adding/removing answer options" do
@@ -521,7 +521,7 @@ shared_examples_for "update questions" do
         select "Single option", from: "Type"
 
         within ".questionnaire-question-answer-options-list" do
-          expect(page).to have_no_button("Remove")
+          expect(page).not_to have_button("Remove")
         end
 
         click_button "Add answer option"
@@ -533,7 +533,7 @@ shared_examples_for "update questions" do
         end
 
         within ".questionnaire-question-answer-options-list" do
-          expect(page).to have_no_button("Remove")
+          expect(page).not_to have_button("Remove")
         end
       end
 
@@ -542,7 +542,7 @@ shared_examples_for "update questions" do
 
       within ".questionnaire-question:last-of-type" do
         within ".questionnaire-question-answer-options-list" do
-          expect(page).to have_no_button("Remove")
+          expect(page).not_to have_button("Remove")
         end
       end
     end