Show auto-accept countdowns only for ready offers

Hide the countdown when an offer has unmet requirements, missing locations,
expired terms or insufficient service capacity. Keep manual acceptance
available with its existing behavior.

Share capacity previews across the Deals, city and fiber views, reuse them
between automatic checks, and invalidate them after actions or incidents.
Check changing requirements immediately and always perform a fresh full
validation before automatically signing a contract.

Add regression tests for blocked offers, requirements becoming fulfilled
or unfulfilled, capacity changes and preview reuse. All 17 automation tests
pass; the full independent branch passes 314 of 315 tests, with only the
pre-existing locale-dependent subsea formatting failure remaining.
This commit is contained in:
logfro 2026-10-28 02:55:12 +01:00
parent abe92fe3b1
commit dd82737af8
6 changed files with 64 additions and 14 deletions

View file

@ -44,14 +44,16 @@ test('Accept buttons share a real-time countdown in Deals, city offers and fiber
assert.equal(dom.window.document.querySelectorAll('[data-auto-sales]').length, 0);
ev("ACT.autoToggle({k:'autoSales'});renderAutoCountdown()");
const counts = () => [...dom.window.document.querySelectorAll('[data-auto-sales]')];
assert.ok(counts().length >= 2, 'Deals and the city panel both show it');
assert.ok(counts().every(el => el.textContent === '(5)'));
const readyCounts = () => counts().filter(el => el.dataset.autoSales === 'ready');
assert.ok(readyCounts().length >= 2, 'Deals and the city panel both show it');
assert.ok(readyCounts().every(el => el.textContent === '(5)'));
assert.ok(counts().filter(el => el.dataset.autoSales === 'waiting').every(el => el.textContent === ''), 'unmet requirements have no countdown');
ev('testNow=2001;renderAutoCountdown()');
assert.ok(counts().every(el => el.textContent === '(4)'));
assert.ok(readyCounts().every(el => el.textContent === '(4)'));
ev('testNow=3000;UI.speed=8;renderAutoCountdown()');
assert.ok(counts().every(el => el.textContent === '(3)'));
assert.ok(readyCounts().every(el => el.textContent === '(3)'));
ev('UI.speed=0.5;renderAll();renderAutoCountdown()');
assert.ok(counts().every(el => el.textContent === '(3)'), 'game speed and re-rendering leave the real-time clock alone');
assert.ok(readyCounts().every(el => el.textContent === '(3)'), 'game speed and re-rendering leave the real-time clock alone');
assert.match(dom.window.document.querySelector('#leftBody [data-act="accept"]').textContent, /Accept \(3\)/);
ev("ACT.buildPop({city:'ams'});S.links.push({id:'fiber',a:'fra',b:'ams',kind:'df',sys:'lite',ch:[],own:true,km:450,ready:0,cut:0,mo:1})");
offer(ev, 'broker', { type: 'wwave', city2: 'ams', link: 'fiber', slots: 1, what: 'One wave' });
@ -62,13 +64,55 @@ test('Accept buttons share a real-time countdown in Deals, city offers and fiber
ev('testNow=6000;automationTick(testNow);renderAutoCountdown()');
assert.equal(ev("S.biz.some(b=>b.id==='ready')"), true);
assert.equal(ev("S.offers.some(o=>o.id==='waiting')"), true, 'the countdown does not bypass requirements');
assert.ok(counts().every(el => el.textContent === '(5)'), 'the next check starts a fresh countdown');
offer(ev, 'next-ready');
ev('renderAll();renderAutoCountdown()');
assert.ok(counts().filter(el => el.dataset.autoSales === 'next-ready').every(el => el.textContent === '(5)'), 'the next check starts a fresh countdown');
ev("ACT.autoToggle({k:'autoSales'});renderAutoCountdown()");
assert.equal(counts().length, 0);
assert.deepEqual(errors, []);
dom.window.close();
});
test('only ready offers get a countdown, including after requirements or capacity change', () => {
const { ev, dom, errors } = load();
setup(ev);
offer(ev, 'ready');
offer(ev, 'needs-generator', { reqs: ['gen'] });
offer(ev, 'too-big', { bw: 1000 });
offer(ev, 'expired', { exp: 0 });
ev("window.testNow=1000;performance.now=()=>testNow;ACT.leftTab({t:'deals'});ACT.autoToggle({k:'autoSales'});renderAutoCountdown()");
const count = id => dom.window.document.querySelector(`#leftBody [data-auto-sales="${id}"]`).textContent;
assert.equal(count('ready'), '(5)');
assert.equal(count('needs-generator'), '');
assert.equal(count('too-big'), '');
assert.equal(count('expired'), '');
ev('S.pops.fra.gen=true;after()');
assert.equal(count('needs-generator'), '(5)', 'becoming eligible shows the timer');
ev('S.pops.fra.gen=false;compute();renderAutoCountdown()');
assert.equal(count('needs-generator'), '', 'a requirement becoming false hides it immediately');
ev("S.offers.find(o=>o.id==='too-big').bw=2;after()");
assert.equal(count('too-big'), '(5)', 'actions invalidate the capacity preview');
ev('testNow=6000;automationTick(testNow);renderAutoCountdown()');
assert.equal(ev("S.offers.some(o=>o.id==='needs-generator')"), true, 'acceptance checks requirements again');
assert.deepEqual(errors, []);
dom.window.close();
});
test('readiness trials are shared between views and are not repeated for every redraw', () => {
const { ev, dom, errors } = load();
setup(ev);
offer(ev, 'ready');
ev("window.testNow=1000;performance.now=()=>testNow;ACT.leftTab({t:'deals'});UI.sel={type:'city',id:'fra'};UI.tab='cust';window.originalAutoOffer=autoOffer;window.trials=0;window.autoOffer=o=>{trials++;return originalAutoOffer(o)};ACT.autoToggle({k:'autoSales'})");
assert.equal(ev('trials'), 1);
ev('renderAll();compute();renderAll();renderAutoCountdown()');
assert.equal(ev('trials'), 1, 'ordinary routing refreshes reuse the preview');
ev('after()');
assert.equal(ev('trials'), 2, 'a real action refreshes readiness');
ev('window.autoOffer=originalAutoOffer');
assert.deepEqual(errors, []);
dom.window.close();
});
test('auto-accept leaves unready and expired offers alone without failure notifications', () => {
const { ev, dom, errors } = load();
setup(ev);