@@ -1554,7 +1554,7 @@ describe("AcpAdapterV2", () => {
15541554 ] ,
15551555 } ) ) ;
15561556
1557- // regression: #20417 Droid AskUser answers were sent as a cancel
1557+ // regression: #20417 Droid answers were sent as a cancel; #23505 OMP header and question were swapped
15581558 it . live . each ( [
15591559 ...[
15601560 { scenario : "OMP selected option" , answers : { q0 : "Approve" } , content : { q0 : "Approve" } } ,
@@ -1563,18 +1563,6 @@ describe("AcpAdapterV2", () => {
15631563 answers : { q0 : "Please wait" } ,
15641564 content : { q0__other : "Please wait" } ,
15651565 } ,
1566- { scenario : "OMP cancellation" , answers : undefined , content : undefined } ,
1567- {
1568- scenario : "OMP missing header" ,
1569- answers : { q0 : "Hold" } ,
1570- content : { q0 : "Hold" } ,
1571- withoutHeader : true ,
1572- } ,
1573- {
1574- scenario : "OMP selected label with attachment references" ,
1575- answers : { q0 : 'Approve\n\nAttached file "notes.txt": "/server/notes.txt"' } ,
1576- content : { q0__other : 'Approve\n\nAttached file "notes.txt": "/server/notes.txt"' } ,
1577- } ,
15781566 ] . map ( ( fixture ) => ( {
15791567 ...fixture ,
15801568 settings : OMP_SETTINGS ,
@@ -1584,7 +1572,7 @@ describe("AcpAdapterV2", () => {
15841572 q0 : {
15851573 type : "string" ,
15861574 title : "Approve this exact code-only commit?" ,
1587- ... ( "withoutHeader" in fixture ? { } : { description : "Safety-hook false positive" } ) ,
1575+ description : "Safety-hook false positive" ,
15881576 oneOf : [
15891577 { const : "Approve" , title : "Approve" , description : "Commit the verified fix." } ,
15901578 { const : "Hold" , title : "Hold" } ,
@@ -1597,17 +1585,15 @@ describe("AcpAdapterV2", () => {
15971585 questions : [
15981586 {
15991587 id : "q0" ,
1600- header : "withoutHeader" in fixture ? "Question 1" : " Safety-hook false positive",
1588+ header : "Safety-hook false positive" ,
16011589 question : "Approve this exact code-only commit?" ,
16021590 options : [
16031591 { label : "Approve" , value : "Approve" , description : "Commit the verified fix." } ,
16041592 { label : "Hold" , value : "Hold" , description : "Hold" } ,
16051593 ] ,
16061594 } ,
16071595 ] ,
1608- result : fixture . content
1609- ? { action : "accept" , content : fixture . content }
1610- : { action : "cancel" } ,
1596+ result : { action : "accept" , content : fixture . content } ,
16111597 } ) ) ,
16121598 {
16131599 scenario : "OMP unrelated form uses generic mapping" ,
0 commit comments