diff --git a/src/constants.js b/src/constants.js index 9741f694a..746e7ab0f 100644 --- a/src/constants.js +++ b/src/constants.js @@ -76,7 +76,7 @@ exports = module.exports = { PROXY_APP_APPSTORE_ID: 'io.cloudron.builtin.appproxy', - AUTOUPDATE_PATTERN_NEVER: 'never', + CRON_PATTERN_NEVER: 'never', SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8), // also used in dashboard client.js diff --git a/src/cron.js b/src/cron.js index 6e278de0b..e6f627647 100644 --- a/src/cron.js +++ b/src/cron.js @@ -246,7 +246,7 @@ async function handleAutoupdatePatternChanged(pattern) { if (gJobs.autoUpdater) gJobs.autoUpdater.stop(); gJobs.autoUpdater = null; - if (pattern === constants.AUTOUPDATE_PATTERN_NEVER) return; + if (pattern === constants.CRON_PATTERN_NEVER) return; gJobs.autoUpdater = CronJob.from({ cronTime: pattern, diff --git a/src/routes/test/updater-test.js b/src/routes/test/updater-test.js index 7b5ca547c..cba0a4377 100644 --- a/src/routes/test/updater-test.js +++ b/src/routes/test/updater-test.js @@ -48,7 +48,7 @@ describe('Updater API', function () { it('can set autoupdate_pattern to never', async function () { const response = await superagent.post(`${serverUrl}/api/v1/updater/autoupdate_pattern`) .query({ access_token: owner.token }) - .send({ pattern: constants.AUTOUPDATE_PATTERN_NEVER }); + .send({ pattern: constants.CRON_PATTERN_NEVER }); expect(response.status).to.equal(200); }); @@ -56,7 +56,7 @@ describe('Updater API', function () { const response = await superagent.get(`${serverUrl}/api/v1/updater/autoupdate_pattern`) .query({ access_token: owner.token }); expect(response.status).to.equal(200); - expect(response.body.pattern).to.be(constants.AUTOUPDATE_PATTERN_NEVER); + expect(response.body.pattern).to.be(constants.CRON_PATTERN_NEVER); }); it('cannot set invalid autoupdate_pattern', async function () { diff --git a/src/test/updater-test.js b/src/test/updater-test.js index c7f7ab5a8..e9aa6fc9b 100644 --- a/src/test/updater-test.js +++ b/src/test/updater-test.js @@ -49,7 +49,7 @@ describe('updater', function () { before(async function () { safe.fs.unlinkSync(paths.BOX_UPDATE_FILE); - await updater.setAutoupdatePattern(constants.AUTOUPDATE_PATTERN_NEVER); + await updater.setAutoupdatePattern(constants.CRON_PATTERN_NEVER); }); it('no updates', async function () { @@ -102,7 +102,7 @@ describe('updater', function () { describe('app updates', function () { before(async function () { - await updater.setAutoupdatePattern(constants.AUTOUPDATE_PATTERN_NEVER); + await updater.setAutoupdatePattern(constants.CRON_PATTERN_NEVER); }); it('no updates', async function () { diff --git a/src/updater.js b/src/updater.js index 82dc5e85a..0bdf125cf 100644 --- a/src/updater.js +++ b/src/updater.js @@ -51,7 +51,7 @@ const UPDATE_CMD = path.join(__dirname, 'scripts/update.sh'); async function setAutoupdatePattern(pattern) { assert.strictEqual(typeof pattern, 'string'); - if (pattern !== constants.AUTOUPDATE_PATTERN_NEVER) { // check if pattern is valid + if (pattern !== constants.CRON_PATTERN_NEVER) { // check if pattern is valid const job = safe.safeCall(function () { return new CronTime(pattern); }); if (!job) throw new BoxError(BoxError.BAD_FIELD, 'Invalid pattern'); } @@ -321,7 +321,7 @@ async function raiseNotifications() { const pattern = await getAutoupdatePattern(); const boxUpdate = await getBoxUpdate(); - if (pattern === constants.AUTOUPDATE_PATTERN_NEVER && boxUpdate) { + if (pattern === constants.CRON_PATTERN_NEVER && boxUpdate) { const changelog = boxUpdate.changelog.map((m) => `* ${m}\n`).join(''); const message = `Changelog:\n${changelog}\n\nGo to the Settings view to update.\n\n`;