Turn CWA off unless CWA_ENABLED is true
CWA_ENABLED now defaults to false. If a CWA variable is set while CWA is off, the start log has a warning that names it. On the Settings page, the alert about INGEST_DIR moves to Book Downloads and shows with CWA on or off. The Uploads to CWA card moves below Book Downloads.
This commit is contained in:
+14
-6
@@ -115,8 +115,8 @@ test('each group of settings is an open card, and the download help starts close
|
||||
const cards = main.children.filter((el) => el.tagName !== 'h1');
|
||||
assert.deepEqual(cards.map((el) => [el.tagName, el.className, el.open, el.children[0].textContent]), [
|
||||
['details', 'card', true, 'Recheck recent chapters'],
|
||||
['details', 'card', true, 'Uploads to CWA'],
|
||||
['details', 'card', true, 'Book Downloads'],
|
||||
['details', 'card', true, 'Uploads to CWA'],
|
||||
['details', 'card', true, 'Jobs list'],
|
||||
['details', 'card', true, 'Global replacement rules'],
|
||||
['details', 'card', true, 'FanFicFare settings (personal.ini)'],
|
||||
@@ -789,9 +789,17 @@ test('with CWA off, the pages show nothing about CWA', async () => {
|
||||
assert.ok(section(main, 'Add stories'));
|
||||
assert.equal(section(main, 'Import from the library'), undefined);
|
||||
assert.doesNotMatch(main.textContent, /CWA|INGEST_DIR|library/i);
|
||||
settingsPage(main, {}, off);
|
||||
await settle();
|
||||
assert.ok(section(main, 'Jobs list'));
|
||||
assert.equal(section(main, 'Uploads to CWA'), undefined);
|
||||
assert.doesNotMatch(main.textContent, /CWA|INGEST_DIR|library/i);
|
||||
for (const ingest of [true, false]) {
|
||||
api.on('GET', 'settings', { recent_chapters: 3, personal_ini: '[defaults]', ingest_available: ingest });
|
||||
settingsPage(main, {}, off);
|
||||
await settle();
|
||||
assert.ok(section(main, 'Jobs list'));
|
||||
assert.equal(section(main, 'Uploads to CWA'), undefined);
|
||||
assert.doesNotMatch(main.textContent, /CWA|library/i);
|
||||
// The alert about INGEST_DIR is under Book Downloads, also with CWA off.
|
||||
const note = nodes(section(main, 'Book Downloads')).find((el) => el.attributes.id === 'ingest-note');
|
||||
assert.equal(note.hidden, ingest);
|
||||
assert.equal(note.className, 'notice');
|
||||
assert.match(note.textContent, /INGEST_DIR is not set\. Bindery sends no book to the ingest folder/);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user