From c384cde37a45f2a5a26bab6c16458889e7be2129 Mon Sep 17 00:00:00 2001 From: Stalgia Grigg Date: Wed, 13 Dec 2023 13:17:54 -0800 Subject: [PATCH] Handle merge conflicts in ava snapshots --- src/host/tests/snapshots/cli-run-plan.js.md | 12 ++++++------ src/host/tests/snapshots/cli-run-plan.js.snap | Bin 1252 -> 1273 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/host/tests/snapshots/cli-run-plan.js.md b/src/host/tests/snapshots/cli-run-plan.js.md index 8650939..cd89c99 100644 --- a/src/host/tests/snapshots/cli-run-plan.js.md +++ b/src/host/tests/snapshots/cli-run-plan.js.md @@ -154,15 +154,15 @@ Generated by [AVA](https://avajs.dev). `, stdout: `Callback Fetch Mocked: http://example.com/?TEST-STATUS=418 {␊ method: 'post',␊ - body: '{"testCsvRow":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for role up"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ + body: '{"testCsvRow":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for UP_ARROW"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ headers: { 'Content-Type': 'application/json', x: 'y' }␊ }␊ Callback Fetch Mocked: http://example.com/?TEST-STATUS=418 {␊ method: 'post',␊ - body: '{"testCsvRow":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for role down"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ + body: '{"testCsvRow":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for UP_ARROW,DOWN_ARROW"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ headers: { 'Content-Type': 'application/json', x: 'y' }␊ }␊ - {"name":"unknown","tests":[{"filepath":"tests/test-1.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW","expectation":"role up","output":"mocked output for role up","pass":true}]}]},{"filepath":"tests/test-2.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW,DOWN_ARROW","expectation":"role down","output":"mocked output for role down","pass":true}]}]}],"log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."},{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}]}␊ + {"name":"unknown","tests":[{"filepath":"tests/test-1.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW","output":"mocked output for UP_ARROW"}],"results":[{"command":"UP_ARROW","expectation":"role up","pass":true,"output":"mocked output for role up"}]}]},{"filepath":"tests/test-2.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW,DOWN_ARROW","output":"mocked output for UP_ARROW,DOWN_ARROW"}],"results":[{"command":"UP_ARROW,DOWN_ARROW","expectation":"role down","pass":true,"output":"mocked output for role down"}]}]}],"log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."},{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}]}␊ `, } @@ -194,14 +194,14 @@ Generated by [AVA](https://avajs.dev). `, stdout: `Callback Fetch Mocked: http://example.com/?TEST-STATUS=418&TEST-BAD-BODY {␊ method: 'post',␊ - body: '{"testCsvRow":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for role up"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ + body: '{"testCsvRow":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for UP_ARROW"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ headers: { 'Content-Type': 'application/json', x: 'y' }␊ }␊ Callback Fetch Mocked: http://example.com/?TEST-STATUS=418&TEST-BAD-BODY {␊ method: 'post',␊ - body: '{"testCsvRow":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for role down"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ + body: '{"testCsvRow":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"responses":["mocked output for UP_ARROW,DOWN_ARROW"],"atVersionName":"1.0","browserVersionName":"1.0"}',␊ headers: { 'Content-Type': 'application/json', x: 'y' }␊ }␊ - {"name":"unknown","tests":[{"filepath":"tests/test-1.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW","expectation":"role up","output":"mocked output for role up","pass":true}]}]},{"filepath":"tests/test-2.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW,DOWN_ARROW","expectation":"role down","output":"mocked output for role down","pass":true}]}]}],"log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."},{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}]}␊ + {"name":"unknown","tests":[{"filepath":"tests/test-1.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":1,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW","output":"mocked output for UP_ARROW"}],"results":[{"command":"UP_ARROW","expectation":"role up","pass":true,"output":"mocked output for role up"}]}]},{"filepath":"tests/test-2.json","log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}],"results":[{"testId":2,"capabilities":{"browserName":"mock","browserVersion":"1.0","atName":"mock","atVersion":"1.0","platformName":"mock"},"commands":[{"command":"UP_ARROW,DOWN_ARROW","output":"mocked output for UP_ARROW,DOWN_ARROW"}],"results":[{"command":"UP_ARROW,DOWN_ARROW","expectation":"role down","pass":true,"output":"mocked output for role down"}]}]}],"log":[{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."},{"data":{"type":"openPage","date":"2000-01-01T12:00:00.000Z","url":{}},"text":"Open page: 'http://localhost:8888/static/reference/index.html'."}]}␊ `, } diff --git a/src/host/tests/snapshots/cli-run-plan.js.snap b/src/host/tests/snapshots/cli-run-plan.js.snap index 3218300246b2444341e859368b8714afb264cc38..94fa60a3db73142802f398734d73ef316ff2d28a 100644 GIT binary patch literal 1273 zcmV@8OXP4koEehe zyz6xW>K^gm-xJ}BfRH%AQO)NOj=4t#fBUZ6#R9)td%9Zqs31Sanz34k-%a@cYo$>5 z!g&0-@wm}>O&mYydjd1zM~Aj; z7n`I<7>QhhIAMLlP~dYxBIrdlLY5~)>{KdXFb+J*g|i7C%P#JM&B#ikqlgY73k`hX zp*j+T3yyHqMbA*r4+uw$;4bPh8X`^;2D4Z_%8sn*d2t{60qz9k>Ah(U_j7)JHOC1zE zwF^dr1oX(3dbL_DS8MQX)#^^Q3SS$VegcVv1u%3xmJ<#I$X?0M=D1xl8R1Eg*(?qH zzH2(QlIh|Ycl^K?KH<{J4x>^ni%N6<3a+uK`7pF0zo`VtnJdF6~+8FWvCNN^-USY)KZoKZ*eukpuvE)wR z#?N;WH}XBM!Q;Mz$AWR!2yzb*&(NTpSnwuK?WE6@AG7Oy8wT6AMl6n%*_NYkJr8ek1fgv~utrc;-za z;b-9aa3A&nX?YIP|DA{QZ1uWG|72Ao{gNU5cdgbg+Nf=!6S9B@m-v0yjsp)=GZNF( z)O7#L%U>bUy;;SbC?&{6r34w`5O~XmlezMB>zln+d9StA+TZ(1dPP?ji_+{6nvXA4 zLi|^b*A>M%G0>%hE**5~pi2i`I^0a@uzktWA(g=J0`WcmKwt8Pn=dOq!FgrHpVuxc zJY81YgR){jbv=T>!Y(eOBvLLEGjLJX6fpk+_4ihvL_PojueNLe literal 1252 zcmV<+;F9yAUx`*P&mqhw9AcO@tYWO0;On6j^A71qPSmI}E-jAFrf7j%jr7^Q;oCQJ+2C!A-);&;VeiMjNn z1KYOCZ89L7L@q&s@FT)e;0sA2m_;-~mM0~1YBg{e2ObsD*?^B_mv_KtWW~{8M2C@u zhQ9Pr6GAU3< z$CHH+J|K~_%ln(^x9gzkZ6z|q<0#ol;vVBvQkMp&F3ea1JG)5$lp%Ofaw}W6=0|-p zvOO6F*3^0}Mk2((3+HmTXJ5aYRof(_iFJM&_arM<#hWsANxaip74K6`ey*O*rj*)( z%A~P8sm!0=7@H9eiRqYGWtkN-sVURhADgP87?vJPD`B-^KNnP~1oR+LP;Fy6V^bb8 zWrISbcED-SfEgue*6a0Zy#e1&qv_P^@U=noHE6^B3)SK1t0LN>VeQNvdqOo<6xOU;VUGuF6=Zb}nb#e5Iz64>!7# z@-#d*7r^uDMezLB((wH9zkugQ_X?g*F=tuGyueU?JXr}C|8*r{d~w7zpyw3OZhx=DIf_qWZpucjUpCwI0zlQ#M4E-X3{uG|T zLeRtR;XDy2|EY<9CIXrW%oBm%*0!>)L7x%ndg#mK#BvbIygX?t8@jlL#$|*;B0UNk z76ad{3P^gie+=XF_}&snZ92R=+yyvcG!kmX{YwzEJ7qGnkeZ$KXKHGa?A3!VgeeD& zk+nr5=xbfIk}RtFN#1fo06L!q#DU&{X*4NM%KujU?+QY% z6aNJNa+3i~g*6qcNA+^#-uZ9mie|8DsI?X#e71Nt_QGh(T41Nt_gZv(f# O4g3wQ1E$|IIsgD)m|M00