Make data-turbo-confirm work with multiple submitters inside a form; …

…add tests (#564)

Co-authored-by: Felipe <[email protected]>

src/core/drive/form_submission.ts

@@ -108,7 +108,7 @@ export class FormSubmission {
   }
 
   get confirmationMessage() {
-    return this.formElement.getAttribute("data-turbo-confirm")
+    return this.submitter?.getAttribute("data-turbo-confirm") || this.formElement.getAttribute("data-turbo-confirm")
   }
 
   get needsConfirmation() {

src/tests/fixtures/form.html

@@ -75,6 +75,7 @@ <h1>Form</h1>
       </form>
       <form action="/__turbo/redirect" method="post" class="confirm" data-turbo-confirm="Are you sure?">
         <input type="submit">
+        <button type="submit" name="greeting" id="secondary_submitter" data-turbo-confirm="Are you really sure?" formaction="/__turbo/redirect?path=/src/tests/fixtures/one.html" formmethod="post" value="secondary_submitter">Secondary action</button>
       </form>
     </div>
     <hr>

src/tests/functional/form_submission_tests.ts

@@ -26,6 +26,7 @@ export class FormSubmissionTests extends TurboDriveTestCase {
     this.assert.equal(await this.getAlertText(), "Are you sure?")
     await this.acceptAlert()
     this.assert.ok(await this.formSubmitStarted)
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/one.html")
   }
 
   async "test form submission with confirmation cancelled"() {
@@ -36,6 +37,25 @@ export class FormSubmissionTests extends TurboDriveTestCase {
     this.assert.notOk(await this.formSubmitStarted)
   }
 
+  async "test form submission with secondary submitter click - confirmation confirmed"() {
+    await this.clickSelector("#standard form.confirm #secondary_submitter")
+
+    this.assert.equal(await this.getAlertText(), "Are you really sure?")
+    await this.acceptAlert()
+    this.assert.ok(await this.formSubmitStarted)
+    this.assert.equal(await this.pathname, "/src/tests/fixtures/one.html")
+    this.assert.equal(await this.visitAction, "advance")
+    this.assert.equal(await this.getSearchParam("greeting"), "secondary_submitter")
+  }
+
+  async "test form submission with secondary submitter click - confirmation cancelled"() {
+    await this.clickSelector("#standard form.confirm #secondary_submitter")
+
+    this.assert.equal(await this.getAlertText(), "Are you really sure?")
+    await this.dismissAlert()
+    this.assert.notOk(await this.formSubmitStarted)
+  }
+
   async "test from submission with confirmation overriden"() {
     await this.remote.execute(() => window.Turbo.setConfirmMethod(() => confirm("Overriden message")))