decidim-forms 0.28.5 → 0.29.0.rc1

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)
@@ -57,32 +57,6 @@ shared_examples_for "has questionnaire" do
       expect(page).to have_no_i18n_content(question.body)
     end
 
-    context "and there is a mandatory question" do
-      let!(:question) do
-        create(
-          :questionnaire_question,
-          questionnaire:,
-          question_type: "short_answer",
-          position: 0,
-          mandatory: true
-        )
-      end
-
-      before do
-        visit questionnaire_public_path
-      end
-
-      it "it renders the asterisk as a separated element" do
-        within "label.answer-questionnaire__question-label" do
-          expect(page).to have_content(translated_attribute(question.body).to_s)
-          within "span.label-required.has-tip" do
-            expect(page).to have_content("*")
-            expect(page).to have_content("Required field")
-          end
-        end
-      end
-    end
-
     context "with multiple steps" do
       let!(:separator) { create(:questionnaire_question, questionnaire:, position: 1, question_type: :separator) }
       let!(:question2) { create(:questionnaire_question, questionnaire:, position: 2) }
@@ -95,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")
@@ -116,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)
 
@@ -127,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
@@ -174,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
 
@@ -205,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"
@@ -246,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
@@ -255,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
@@ -268,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
@@ -301,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
@@ -316,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
 
@@ -361,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)
 
@@ -375,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")
@@ -390,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")
@@ -417,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")
@@ -432,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")
@@ -449,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"
@@ -475,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)
 
@@ -499,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)
 
@@ -533,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
@@ -565,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)
@@ -581,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(
@@ -609,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(" "))
@@ -621,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)
 
@@ -642,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")
 
@@ -660,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")
@@ -689,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(" "))
@@ -702,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)
 
@@ -718,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
@@ -747,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")
@@ -756,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
@@ -772,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")
@@ -792,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")
 
@@ -1332,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

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

@@ -38,10 +38,10 @@ shared_examples_for "manage questionnaire answers" do
     context "and managing answers page" do
       before do
         visit questionnaire_edit_path
-        click_link "Show responses"
+        click_on "Show responses"
       end
 
-      it "shows the anwers page" do
+      it "shows the answers page" do
         expect(page).to have_content(answer1.body)
         expect(page).to have_content(answer1.question.body["en"])
         expect(page).to have_content(answer2.body)
@@ -66,7 +66,7 @@ shared_examples_for "manage questionnaire answers" do
         let(:first_type) { "long_answer" }
 
         it "shows session token" do
-          expect(page).not_to have_content(answer1.body)
+          expect(page).to have_no_content(answer1.body)
           expect(page).to have_content(answer1.session_token)
           expect(page).to have_content(answer2.session_token)
           expect(page).to have_content(answer3.session_token)
@@ -98,36 +98,36 @@ shared_examples_for "manage questionnaire answers" do
 
       before do
         visit questionnaire_edit_path
-        click_link "Show responses"
+        click_on "Show responses"
       end
 
       it "shows all the questions and responses" do
-        click_link answer1.body, match: :first
+        click_on answer1.body, match: :first
         expect(page).to have_content(first.body["en"])
         expect(page).to have_content(second.body["en"])
         expect(page).to have_content(answer1.body)
       end
 
       it "first answer has a next link" do
-        click_link answer1.body, match: :first
+        click_on answer1.body, match: :first
         expect(page).to have_link("Next ›")
-        expect(page).not_to have_link("‹ Prev")
+        expect(page).to have_no_link("‹ Prev")
       end
 
       it "second answer has prev/next links" do
-        click_link answer2.body, match: :first
+        click_on answer2.body, match: :first
         expect(page).to have_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
 
       it "third answer has prev link" do
-        click_link answer3.session_token, match: :first
-        expect(page).not_to have_link("Next ›")
+        click_on answer3.session_token, match: :first
+        expect(page).to have_no_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
 
       it "third answer has download link for the attachments" do
-        click_link answer3.session_token, match: :first
+        click_on answer3.session_token, match: :first
         expect(page).to have_content(translated(file_answer.attachments.first.title))
         expect(page).to have_content(translated(file_answer.attachments.second.title))
       end
@@ -140,7 +140,7 @@ shared_examples_for "manage questionnaire answers" do
         end
 
         it "third answer has download link for the attachments" do
-          click_link answer3.session_token, match: :first
+          click_on answer3.session_token, match: :first
           expect(page).to have_content("Download attachment")
         end
       end

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

@@ -21,13 +21,13 @@ shared_examples_for "add display conditions" do
       end
 
       it "does not display an add display condition button" do
-        expect(page).not_to have_button("Add display condition")
+        expect(page).to have_no_button("Add display condition")
       end
 
       context "when creating a new question" 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"
+            click_on "Add question"
             expand_all_questions
 
             expect(page).to have_button("Add display condition", disabled: true)
@@ -80,19 +80,19 @@ shared_examples_for "add display conditions" do
             within_add_display_condition do
               expect(page).to have_select("Question")
               expect(page).to have_select("Condition")
-              expect(page).to have_selector("[id$=mandatory]")
+              expect(page).to have_css("[id$=mandatory]")
 
               select question_single_option.body["en"], from: "Question"
               select "Answered", from: "Condition"
 
-              expect(page).not_to have_select("Answer option")
-              expect(page).not_to have_css("[id$=condition_value_en]", visible: :visible)
+              expect(page).to have_no_select("Answer option")
+              expect(page).to have_no_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).not_to have_css("[id$=condition_value_en]", visible: :visible)
+              expect(page).to have_no_css("[id$=condition_value_en]", visible: :visible)
             end
           end
         end
@@ -163,17 +163,17 @@ 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).not_to have_selector("[id$=mandatory][checked]")
+            expect(page).to have_css("[id$=mandatory]")
+            expect(page).to have_no_css("[id$=mandatory][checked]")
           end
         end
 
         it "can be removed" do
           within_add_display_condition do
-            click_button "Remove"
+            click_on "Remove"
           end
 
-          click_button "Save"
+          click_on "Save"
 
           expect(page).to have_admin_callout("successfully")
         end