Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b3cbe4296 | ||
|
|
1e8a20074d | ||
|
|
2e78c7e593 | ||
|
|
fbfcd942be |
No files matched your search
@@ -25,8 +25,27 @@
|
||||
// E2E6 P1-1: a poll reloads this state; the last save's receipt and the open review list stay.
|
||||
// A failed poll keeps the last good read only while the page holds the form (dirty, or a field has
|
||||
// focus), so the held form is not dropped (review P3). A clean form shows the read error (re-check P3).
|
||||
const held=org=>{const form=[...document.querySelectorAll('[data-autonomy-org]')].find(n=>n.dataset.autonomyOrg===org)?.querySelector('[data-autonomy-form]');return !!form&&(form.hasAttribute('data-live-dirty')||form.contains(document.activeElement));};
|
||||
async function load(org) {const prev=states.get(org),keep={status:prev?.status??'',reviewOpen:prev?.reviewOpen===true};try{states.set(org,{...await call(org,''),...keep});}catch(error){states.set(org,prev&&!prev.error&&held(org)?{...prev,...keep}:{error:error.message,...keep});}}
|
||||
// The settings section the page draws now for this organization (a decision notice carries the org too).
|
||||
const live=org=>[...document.querySelectorAll('[data-autonomy-org]')].find(n=>n.dataset.autonomyOrg===org&&!n.hasAttribute('data-autonomy-decision'));
|
||||
const held=org=>{const form=live(org)?.querySelector('[data-autonomy-form]');return !!form&&(form.hasAttribute('data-live-dirty')||form.contains(document.activeElement));};
|
||||
// Each organization keeps one state object for the life of the page. A save or review keeps a reference
|
||||
// to it across its own request, so a load that ends meanwhile writes its read into that object in place
|
||||
// and never swaps it: the receipt lands where the next draw reads it. A load that began before the last
|
||||
// applied read, or before a save answered, carries older values, so its answer is dropped.
|
||||
const own=['status','reviewOpen','began','shown'];
|
||||
function put(s,read) {for(const k of Object.keys(s))if(!own.includes(k))delete s[k];for(const [k,v]of Object.entries(read))if(!own.includes(k))s[k]=v;}
|
||||
const stateOf=org=>{if(!states.has(org))states.set(org,{error:'Autonomy could not be read.',status:'',reviewOpen:false,began:0,shown:0});return states.get(org);};
|
||||
async function load(org) {
|
||||
const s=stateOf(org),began=++s.began;let read,failed=false;
|
||||
try{read=await call(org,'');}catch(error){read={error:error.message};failed=true;}
|
||||
if(began<s.shown)return;
|
||||
s.shown=began;
|
||||
if(failed&&!s.error&&held(org))return;
|
||||
put(s,read);
|
||||
}
|
||||
// A result said on this organization's status line: kept in its state for the next draw, and written to
|
||||
// the line the page draws now.
|
||||
function say(org,text) {const s=stateOf(org);s.status=text;const line=live(org)?.querySelector('[data-autonomy-status]');if(line)line.textContent=text;}
|
||||
function section(org) {
|
||||
const s=states.get(org);
|
||||
if(!s || s.error)return `<section class="panel" data-autonomy><h3>Autonomy</h3><p>${esc(s?.error??'Autonomy could not be read.')}</p></section>`;
|
||||
@@ -51,13 +70,22 @@
|
||||
}
|
||||
document.addEventListener('submit',async e=>{
|
||||
if(!e.target.matches('[data-autonomy-form]'))return;e.preventDefault();
|
||||
const form=e.target,section=form.closest('[data-autonomy-org]'),org=section.dataset.autonomyOrg,s=states.get(org),fields=new FormData(form);
|
||||
const form=e.target,org=form.closest('[data-autonomy-org]').dataset.autonomyOrg,s=states.get(org),fields=new FormData(form);
|
||||
const autonomy=Object.fromEntries(classes.map(k=>[k,fields.get(k)]));autonomy.notices=fields.has('notices');autonomy.reverseWindowHours=Number(fields.get('reverseWindowHours'));
|
||||
if(fields.get('authorityResolver'))autonomy.authorityResolver=fields.get('authorityResolver');
|
||||
const button=form.querySelector('button[type="submit"]'),status=form.querySelector('[data-autonomy-status]');button.disabled=true;
|
||||
const button=form.querySelector('button[type="submit"]');button.disabled=true;
|
||||
let base=s.revision;try{if(form.dataset.revision)base=JSON.parse(form.dataset.revision);}catch{/* drawn without one */}
|
||||
try{const r=await call(org,'',{revision:base,autonomy});s.revision=r.revision;s.autonomy=autonomy;s.levels=Object.fromEntries(classes.map(k=>[k,autonomy[k]]));s.status=`Saved. Receipt ${r.transaction}.`;form.dataset.revision=JSON.stringify(r.revision);delete form.dataset.liveDirty;status.textContent=s.status;}
|
||||
catch(error){s.status=error.message;status.textContent=s.status;}finally{button.disabled=false;}
|
||||
// A load that began before the save answered is dropped. A load that ended during the save read either
|
||||
// the revision the save sent, from before it committed, or one at or after the save. One that is neither
|
||||
// was written after the save by someone else: it stays, and the save's values do not replace it.
|
||||
// A redraw during the save may have drawn a new form from an older read. A clean new form is drawn again
|
||||
// from the state, which now holds the newest read known, so it shows that and saves against its revision.
|
||||
// A new form the owner is editing stays: it saves against its own revision and fails closed.
|
||||
try{const r=await call(org,'',{revision:base,autonomy}),sent=JSON.stringify(base);s.shown=++s.began;
|
||||
if([sent,JSON.stringify(r.revision)].includes(JSON.stringify(s.revision))){s.revision=r.revision;s.autonomy=autonomy;s.levels=Object.fromEntries(classes.map(k=>[k,autonomy[k]]));}
|
||||
form.dataset.revision=JSON.stringify(r.revision);delete form.dataset.liveDirty;s.status=`Saved. Receipt ${r.transaction}.`;
|
||||
const el=live(org),drawn=el?.querySelector('[data-autonomy-form]');if(drawn&&drawn!==form&&!held(org))el.outerHTML=section(org);say(org,s.status);}
|
||||
catch(error){say(org,error.message);}finally{button.disabled=false;}
|
||||
});
|
||||
// An edited form is dirty until it saves: holdLive keeps a dirty form through every poll.
|
||||
const dirty=e=>{const form=e.target.closest?.('[data-autonomy-form]');if(form)form.dataset.liveDirty='1';};
|
||||
@@ -71,8 +99,8 @@
|
||||
const review=button.dataset.autonomyReview,reverse=button.hasAttribute('data-autonomy-reverse');
|
||||
const body=review?{decisionClass:review}:reverse?{id:section.dataset.autonomyDecision}:{id:section.dataset.autonomyDecision,confirm:button.dataset.autonomyConfirm==='yes',...(button.dataset.autonomyConfirm==='no'?{reason:section.querySelector('[data-autonomy-reason]').value}:{})};
|
||||
button.disabled=true;
|
||||
try{const r=await call(org,review?'review':reverse?'reverse':'confirm',body);status.textContent=review?'Trail review recorded.':reverse?(r.restart||r.trailPending?'Reversal committed. Completion needs recovery: inspect the decision trail and the stopped agent before requesting relaunch.':'Reversal recorded.'):(body.confirm?'Confirmation recorded. Refresh the inbox for current state.':'Returned to arbiter. Refresh the inbox for current state.');}
|
||||
catch(error){status.textContent=error.message;}finally{button.disabled=false;}
|
||||
try{const r=await call(org,review?'review':reverse?'reverse':'confirm',body);if(review)return say(org,'Trail review recorded.');status.textContent=reverse?(r.restart||r.trailPending?'Reversal committed. Completion needs recovery: inspect the decision trail and the stopped agent before requesting relaunch.':'Reversal recorded.'):(body.confirm?'Confirmation recorded. Refresh the inbox for current state.':'Returned to arbiter. Refresh the inbox for current state.');}
|
||||
catch(error){if(review)say(org,error.message);else status.textContent=error.message;}finally{button.disabled=false;}
|
||||
});
|
||||
window.MosaicAutonomy={load,section,notice};
|
||||
})();
|
||||
@@ -51,3 +51,145 @@ for(const [width,height]of [[1440,900],[390,844]])for(const theme of ['light','d
|
||||
await waitFor(b,`/Reversal recorded/.test(document.querySelector('[data-autonomy-status]').textContent)`);assert.equal(reverses,1);
|
||||
await b.screenshot(join(shots,`reverse-${width}-${theme}.png`));
|
||||
});
|
||||
|
||||
// The organization page reads autonomy again on a poll and after any write that changes the organization
|
||||
// (mosaic-org-changed). A save or review receipt must survive a reload that overlaps it, in either order,
|
||||
// and an older read that answers last must not put its older values back.
|
||||
// hold(verb) makes the next call of that verb wait: its answer is computed when the call arrives, then held
|
||||
// until release(). arrived resolves when the call has arrived.
|
||||
function holds(){
|
||||
const pending=new Map();
|
||||
return {
|
||||
hold(verb){const h={};h.arrived=new Promise(r=>{h.reached=r;});h.wait=new Promise(r=>{h.release=r;});pending.set(verb,[...(pending.get(verb)??[]),h]);return h;},
|
||||
take:verb=>pending.get(verb)?.shift(),
|
||||
};
|
||||
}
|
||||
async function raceFixture(t,gates){
|
||||
const state={writes:0,reviews:0,setting:{merge:'out of the loop'},revision:'a'.repeat(64)};
|
||||
const answer=(verb,args)=>{
|
||||
if(verb==='autonomy.get.console')return {revision:state.revision,autonomy:state.setting,levels:{'cross-role':'out of the loop',merge:state.setting.merge,policy:'out of the loop',authority:'in the loop'}};
|
||||
if(verb==='autonomy.set.console'){assert.equal(args.revision,state.revision);state.writes++;state.setting=args.autonomy;state.revision=String(state.writes+1).repeat(64);return {revision:state.revision,transaction:`10000000-0000-4000-8000-00000000000${state.writes}`};}
|
||||
if(verb==='autonomy.review.console'){state.reviews++;return {recorded:true};}
|
||||
throw Object.assign(new Error('not-configured'),{code:'not-configured'});
|
||||
};
|
||||
const call=async(verb,args)=>{const value=answer(verb,args),held=gates.take(verb);if(held){held.reached();await held.wait;}return value;};
|
||||
const server=await startServer({port:0,sso:createDevOwner(),send:async()=>({}),organizations:{list:async()=>[{id:'acme',label:'Acme',busHealthy:true}],resolve:async()=>({busHealthy:true,decisionWrite:async()=>({}),requestRead:call,requestWrite:call,send:async()=>({}),reads:{business:async()=>({business:{id:'acme',projects:[],instances:[]}}),settings:async()=>({}),queue:async()=>({rows:[]})},bus:{instances:async()=>({instances:{}}),agents:async()=>[],'thread.claims':async()=>[],tasks:async()=>[],inbox:async()=>[],messages:async()=>({messages:[]})},chat:{projects:async()=>[],threads:async()=>[]}})},log:()=>{}});
|
||||
t.after(()=>close(server));const b=await browser({machine:false});t.after(()=>b.close());
|
||||
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/acme/organization`);
|
||||
await waitFor(b,`document.querySelector('[data-autonomy-form] button[type=submit]')`);
|
||||
return {b,state};
|
||||
}
|
||||
const reload=b=>b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
|
||||
const markDrawn=b=>b.evaluate(`document.querySelector('[data-autonomy]').dataset.drawn='before';true`);
|
||||
const redrawn=b=>waitFor(b,`document.querySelector('[data-autonomy-form]') && !document.querySelector('[data-autonomy]').dataset.drawn`);
|
||||
const statusText=b=>b.evaluate(`document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent`);
|
||||
const submit=(b,level)=>b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value=${JSON.stringify(level)};document.querySelector('[data-autonomy-form]').requestSubmit();true`);
|
||||
// Count each autonomy read by the revision it carries, once the reading load has used it: a task queued
|
||||
// after the answer runs after the load's last step. A poll that reads meanwhile counts under its own revision.
|
||||
const countReads=b=>b.evaluate(`{const f=window.fetch;window.__autonomyRead={};window.fetch=async(...a)=>{const r=await f(...a);if(String(a[0]).endsWith('/api/orgs/acme/autonomy')&&!a[1]?.method){const j=r.json.bind(r);r.json=()=>j().then(v=>{setTimeout(()=>{window.__autonomyRead[v.revision]=(window.__autonomyRead[v.revision]??0)+1});return v})}return r}}true`);
|
||||
const readUsed=(b,revision)=>waitFor(b,`window.__autonomyRead[${JSON.stringify(revision)}]>=1`);
|
||||
|
||||
test('AU owner settings: a save that lands while a reload of autonomy is held keeps its receipt and revision',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
// The reload's read arrives first and answers after the save has been drawn.
|
||||
const list=gates.hold('autonomy.get.console');
|
||||
await reload(b);await list.arrived;
|
||||
await submit(b,'in the loop');
|
||||
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-status]').textContent)`);
|
||||
assert.equal(state.writes,1);
|
||||
await markDrawn(b);list.release();await redrawn(b);
|
||||
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/,'the reload kept the receipt');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision),'the form saves against the revision the save answered');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'in the loop','the form shows what was saved');
|
||||
// The next save is not a revision conflict.
|
||||
await submit(b,'near the loop');
|
||||
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
|
||||
assert.equal(state.writes,2);
|
||||
});
|
||||
|
||||
test('AU owner settings: a save that answers after a reload has drawn the page keeps its receipt',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
// The save arrives first and answers after a reload has drawn the page again.
|
||||
const save=gates.hold('autonomy.set.console');
|
||||
await submit(b,'in the loop');await save.arrived;
|
||||
await markDrawn(b);await reload(b);await redrawn(b);
|
||||
save.release();
|
||||
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
|
||||
await markDrawn(b);await reload(b);await redrawn(b);
|
||||
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/,'a later reload keeps the receipt');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision));
|
||||
});
|
||||
|
||||
test('AU owner settings: a trail review that answers after a reload has drawn the page is said',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
await b.evaluate(`document.querySelector('[data-autonomy-review-list]').open=true;true`);
|
||||
const review=gates.hold('autonomy.review.console');
|
||||
await b.evaluate(`document.querySelector('[data-autonomy-review=merge]').click();true`);await review.arrived;
|
||||
await markDrawn(b);await reload(b);await redrawn(b);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-review-list]').open`),true,'the review list stays open');
|
||||
review.release();
|
||||
await waitFor(b,`document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent==='Trail review recorded.'`);
|
||||
assert.equal(state.reviews,1);
|
||||
await markDrawn(b);await reload(b);await redrawn(b);
|
||||
assert.equal(await statusText(b),'Trail review recorded.','a later reload keeps the review receipt');
|
||||
});
|
||||
|
||||
test('AU owner settings: an older read of autonomy that answers last does not replace a newer one',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
await countReads(b);
|
||||
const older=gates.hold('autonomy.get.console');
|
||||
await reload(b);await older.arrived;
|
||||
// Another writer changes the organization; a newer read answers first.
|
||||
state.setting={merge:'near the loop'};state.revision='c'.repeat(64);
|
||||
await reload(b);
|
||||
// The page draws after all of the dashboard's reads, so wait for the draw as well as the read.
|
||||
await waitFor(b,`document.querySelector('[data-autonomy-form] select[name=merge]')?.value==='near the loop' && window.__autonomyRead[${JSON.stringify('c'.repeat(64))}]>=1`);
|
||||
older.release();
|
||||
await readUsed(b,'a'.repeat(64));
|
||||
const drawn=await b.evaluate(`window.MosaicAutonomy.section('acme')`);
|
||||
assert.match(drawn,/<option selected>near the loop<\/option>/,'the older values were not put back');
|
||||
assert.match(drawn,new RegExp(`data-revision=""${'c'.repeat(64)}""`),'the newer revision stays');
|
||||
});
|
||||
|
||||
test('AU owner settings: a save that answers after a redraw from an older read draws what was saved',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
// The reload's read is served before the save commits. It draws a clean new form while the save is held.
|
||||
const read=gates.hold('autonomy.get.console');
|
||||
await reload(b);await read.arrived;
|
||||
const save=gates.hold('autonomy.set.console');
|
||||
await submit(b,'in the loop');await save.arrived;
|
||||
assert.equal(state.writes,1);
|
||||
await markDrawn(b);read.release();await redrawn(b);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'out of the loop','the older read was drawn');
|
||||
save.release();
|
||||
await waitFor(b,`/^Saved\\. Receipt /.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
|
||||
// Before any further reload, the drawn form shows the save and carries its revision.
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify(state.revision),'the drawn form saves against the revision the save answered');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'in the loop','the drawn form shows what was saved');
|
||||
assert.match(await statusText(b),/^Saved\. Receipt 10000000-0000-4000-8000-000000000001\.$/);
|
||||
await submit(b,'near the loop');
|
||||
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
|
||||
assert.equal(state.writes,2,'the next save is not a revision conflict');
|
||||
});
|
||||
|
||||
test('AU owner settings: a save that answers after a newer read by another writer leaves the newer read',{timeout:60000},async t=>{
|
||||
const gates=holds();const {b,state}=await raceFixture(t,gates);
|
||||
// The save commits, then another writer commits, and a reload draws that newer read before the save answers.
|
||||
const save=gates.hold('autonomy.set.console');
|
||||
await submit(b,'in the loop');await save.arrived;
|
||||
assert.equal(state.writes,1);
|
||||
state.setting={merge:'near the loop'};state.revision='c'.repeat(64);
|
||||
await markDrawn(b);await reload(b);await redrawn(b);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'near the loop','the newer read was drawn');
|
||||
save.release();
|
||||
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000001\\.$/.test(document.querySelector('[data-autonomy-form] [data-autonomy-status]').textContent)`);
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form] select[name=merge]').value`),'near the loop','the drawn form keeps the newer read');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]').dataset.revision`),JSON.stringify('c'.repeat(64)));
|
||||
const drawn=await b.evaluate(`window.MosaicAutonomy.section('acme')`);
|
||||
assert.match(drawn,/<option selected>near the loop<\/option>/,'the state keeps the newer read');
|
||||
assert.match(drawn,/data-autonomy-status role="status">Saved\. Receipt 10000000-0000-4000-8000-000000000001\./,'the state keeps the receipt');
|
||||
// The next save goes against the newer revision and is not a conflict.
|
||||
await submit(b,'in the loop');
|
||||
await waitFor(b,`/^Saved\\. Receipt 10000000-0000-4000-8000-000000000002\\.$/.test(document.querySelector('[data-autonomy-status]').textContent)`);
|
||||
assert.equal(state.writes,2);
|
||||
});
|
||||
@@ -31,7 +31,7 @@ const PREVIEW = {
|
||||
|
||||
// busy: the bus's apply committed but its hire loop did not run (hireError), and the packs read lists one line a
|
||||
// member's pack hire left in the owner's inbox (fromPack), one raised some other way and one refused.
|
||||
async function fixture(t, { busy = false } = {}) {
|
||||
async function fixture(t, { busy = false, gates = null } = {}) {
|
||||
const verbs = [], decisions = [];
|
||||
const hired = new Map(); // name -> its pack provenance, as the bus's instances read reports it
|
||||
let applied = null, route = false, instanceReads = 0;
|
||||
@@ -46,19 +46,22 @@ async function fixture(t, { busy = false } = {}) {
|
||||
const listed = () => applied ? [{ id: 'software-team', origin: 'shipped', project: null, hired: [...hired.keys()],
|
||||
open: PREVIEW.hires.filter(h => !hired.has(h.name)).map(h => ({ name: h.name, reason: `Proposed by starter pack software-team for ${h.definition} work.`,
|
||||
...(!busy || h.name === 'scout-1' ? { state: 'refused', code: 'pack-hire-route-missing' } : { state: 'awaiting-owner', decision: `inbox-${h.name}`, ...(h.name === 'coder-1' ? { fromPack: true } : {}) }) })) }] : [];
|
||||
const read = async (verb, args) => {
|
||||
const readAnswer = async (verb, args) => {
|
||||
verbs.push([verb, args]);
|
||||
if (verb === 'packs.console') return { packs: PACKS, applied: listed() };
|
||||
if (verb === 'pack.preview.console') return PREVIEW;
|
||||
if (verb === 'autonomy.get.console') return { revision: REV('e'), autonomy: {}, levels: {} };
|
||||
throw Object.assign(new Error('not-configured'), { code: 'not-configured' });
|
||||
};
|
||||
const write = async (verb, args) => {
|
||||
const writeAnswer = async (verb, args) => {
|
||||
verbs.push([verb, args]);
|
||||
if (verb === 'pack.apply.console') { applied = true; return { revision: REV('f'), added: ['board'], pack: { id: args.pack, version: '1.0.0' }, ...(busy ? { hires: [], hireError: 'organization-busy' } : { hires: hireLoop() }) }; }
|
||||
if (verb === 'pack.hire.console') return { pack: args.pack, hires: hireLoop() };
|
||||
throw Object.assign(new Error('not-configured'), { code: 'not-configured' });
|
||||
};
|
||||
// A held call is answered when it arrives, then waits for release() (holds() below).
|
||||
const gated = answer => async (verb, args) => { const value = await answer(verb, args), held = gates?.take(verb); if (held) { held.reached(); await held.wait; } return value; };
|
||||
const read = gated(readAnswer), write = gated(writeAnswer);
|
||||
const decisionWrite = async (verb, args) => {
|
||||
verbs.push([verb, args]);
|
||||
if (verb === 'hire.start.console' && args.op === 'fire' && hired.has(args.name)) { hired.delete(args.name); return { id: 'fire-1', op: 'resolved', choice: 'yes' }; }
|
||||
@@ -184,3 +187,80 @@ test('PD an apply whose hire loop did not run says so; the owner card counts a p
|
||||
// coder-1 was left in the inbox by a pack hire, so the owner's pack hire approves it; reviewer-1 is the inbox's.
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-pack-hire-button]').textContent`), 'Hire the 2 proposed agents');
|
||||
});
|
||||
|
||||
// hold(verb) makes the next call of that verb wait: its answer is computed when the call arrives, then held
|
||||
// until release(). arrived resolves when the call has arrived.
|
||||
function holds() {
|
||||
const pending = new Map();
|
||||
return {
|
||||
hold(verb) {
|
||||
const h = {};
|
||||
h.arrived = new Promise(r => { h.reached = r; });
|
||||
h.wait = new Promise(r => { h.release = r; });
|
||||
pending.set(verb, [...(pending.get(verb) ?? []), h]);
|
||||
return h;
|
||||
},
|
||||
take: verb => pending.get(verb)?.shift(),
|
||||
};
|
||||
}
|
||||
const reload = b => b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
|
||||
const markDrawn = b => b.evaluate(`document.querySelector('[data-packs]').dataset.drawn='before';true`);
|
||||
const redrawn = (b, what) => waitFor(b, `document.querySelector('[data-packs]') && !document.querySelector('[data-packs]').dataset.drawn`, what);
|
||||
// Count each packs answer once the reading load has used it. With no project pack listed the load has no
|
||||
// further read, so a task queued after the answer runs after the load's last step.
|
||||
const countPacksAnswers = b => b.evaluate(`{const f=window.fetch;window.__packsDone=0;window.fetch=async(...a)=>{const r=await f(...a);if(String(a[0]).endsWith('/api/orgs/acme/packs')){const j=r.json.bind(r);r.json=()=>j().finally(()=>setTimeout(()=>{window.__packsDone++}))}return r}}true`);
|
||||
const HIRED = 'Hired scout-1. Already hired: coder-1, reviewer-1.';
|
||||
// Apply the pack with no route, so scout-1 is left to hire, then set the route.
|
||||
async function applied(t, gates) {
|
||||
const f = await fixture(t, { gates });
|
||||
await f.b.navigate(`http://127.0.0.1:${f.port}/#/orgs/acme/organization`);
|
||||
await waitFor(f.b, `document.querySelector('[data-pack="software-team"] [data-pack-preview-button]')`, 'pack list');
|
||||
await f.b.evaluate(`document.querySelector('[data-pack="software-team"] [data-pack-preview-button]').click();true`);
|
||||
await waitFor(f.b, `document.querySelector('[data-pack-apply]')`, 'preview');
|
||||
await f.b.evaluate(`document.querySelector('[data-pack-apply]').click();true`);
|
||||
await waitFor(f.b, `/^Applied\\./.test(document.querySelector('[data-packs-status]')?.textContent??'') && document.querySelector('[data-pack-hire-button]')`, 'apply status and hire button');
|
||||
f.setRoute(true);
|
||||
return f;
|
||||
}
|
||||
|
||||
// The page reads the packs again on a poll and after any write that changes the organization
|
||||
// (mosaic-org-changed). A hire receipt must survive a reload that overlaps the hire, in either order.
|
||||
test('PD a hire receipt that lands while an earlier read of the packs is held is kept', { timeout: 90000 }, async t => {
|
||||
const gates = holds();
|
||||
const { b, verbs } = await applied(t, gates);
|
||||
await countPacksAnswers(b);
|
||||
// A reload's packs read is held. The hire answers, reads the packs itself and asks the page to read
|
||||
// everything again; both of those reads answer first. Then the held read answers last.
|
||||
const earlier = gates.hold('packs.console');
|
||||
await reload(b);
|
||||
await earlier.arrived;
|
||||
await b.evaluate(`document.querySelector('[data-pack-hire-button]').click();true`);
|
||||
await waitFor(b, `document.querySelector('[data-packs-status]')?.textContent==='${HIRED}' && window.__packsDone>=2`, 'hire status');
|
||||
earlier.release();
|
||||
await waitFor(b, `window.__packsDone>=3`, 'held read answered');
|
||||
await markDrawn(b);
|
||||
await reload(b);
|
||||
await redrawn(b, 'page drawn again after the held read');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), HIRED, 'the hire receipt is kept');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-pack-hire-button]')`), null, 'nothing left to hire');
|
||||
assert.deepEqual(verbs.filter(([v]) => v === 'pack.hire.console').map(([, a]) => a), [{ pack: 'software-team' }]);
|
||||
});
|
||||
|
||||
test('PD a hire that answers after a reload has drawn the page keeps its receipt', { timeout: 90000 }, async t => {
|
||||
const gates = holds();
|
||||
const { b, verbs } = await applied(t, gates);
|
||||
// The hire arrives first and answers after a reload has drawn the page again.
|
||||
const hire = gates.hold('pack.hire.console');
|
||||
await b.evaluate(`document.querySelector('[data-pack-hire-button]').click();true`);
|
||||
await hire.arrived;
|
||||
await markDrawn(b);
|
||||
await reload(b);
|
||||
await redrawn(b, 'page drawn again during the hire');
|
||||
hire.release();
|
||||
await waitFor(b, `document.querySelector('[data-packs-status]')?.textContent==='${HIRED}'`, 'hire status');
|
||||
await markDrawn(b);
|
||||
await reload(b);
|
||||
await redrawn(b, 'page drawn again after the hire');
|
||||
assert.equal(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), HIRED, 'a later reload keeps the hire receipt');
|
||||
assert.deepEqual(verbs.filter(([v]) => v === 'pack.hire.console').map(([, a]) => a), [{ pack: 'software-team' }]);
|
||||
});
|
||||
Reference in new issue
Block a user