fix: correctly verify otpUrl config option

Author: dominykas

index.js

@@ -11,14 +11,15 @@ let verified;
 let prepared;
 
 async function verifyConditions(pluginConfig, context) {
-  // If the npm publish plugin is used and has `npmPublish`, `tarballDir` or `pkgRoot` configured, validate them now in order to prevent any release if the configuration is wrong
+  // If the npm publish plugin is used and has `npmPublish`, `tarballDir`, `pkgRoot` or `otpUrl` configured, validate them now in order to prevent any release if the configuration is wrong
   if (context.options.publish) {
     const publishPlugin =
       castArray(context.options.publish).find(config => config.path && config.path === '@semantic-release/npm') || {};
 
     pluginConfig.npmPublish = defaultTo(pluginConfig.npmPublish, publishPlugin.npmPublish);
     pluginConfig.tarballDir = defaultTo(pluginConfig.tarballDir, publishPlugin.tarballDir);
     pluginConfig.pkgRoot = defaultTo(pluginConfig.pkgRoot, publishPlugin.pkgRoot);
+    pluginConfig.otpUrl = defaultTo(pluginConfig.otpUrl, publishPlugin.otpUrl);
   }
 
   const errors = verifyNpmConfig(pluginConfig);

lib/definitions/errors.js

@@ -21,6 +21,12 @@ Your configuration for the \`tarballDir\` option is \`${tarballDir}\`.`,
     details: `The [pkgRoot option](${linkify('README.md#pkgroot')}) option, if defined, must be a \`String\`.
 
 Your configuration for the \`pkgRoot\` option is \`${pkgRoot}\`.`,
+  }),
+  EINVALIDOTPURL: ({otpUrl}) => ({
+    message: 'Invalid `otpUrl` option.',
+    details: `The [otpUrl option](${linkify('README.md#otpurl')}) option, if defined, must be a \`String\`.
+
+Your configuration for the \`otpUrl\` option is \`${otpUrl}\`.`,
   }),
   ENONPMTOKEN: ({registry}) => ({
     message: 'No npm token specified.',

lib/verify-config.js

@@ -10,8 +10,8 @@ const VALIDATORS = {
   otpUrl: isNonEmptyString,
 };
 
-module.exports = ({npmPublish, tarballDir, pkgRoot}) => {
-  const errors = Object.entries({npmPublish, tarballDir, pkgRoot}).reduce(
+module.exports = ({npmPublish, tarballDir, pkgRoot, otpUrl}) => {
+  const errors = Object.entries({npmPublish, tarballDir, pkgRoot, otpUrl}).reduce(
     (errors, [option, value]) =>
       !isNil(value) && !VALIDATORS[option](value)
         ? [...errors, getError(`EINVALID${option.toUpperCase()}`, {[option]: value})]

test/verify-config.test.js

@@ -8,8 +8,8 @@ test.beforeEach(t => {
   t.context.logger = {log: t.context.log};
 });
 
-test('Verify "npmPublish", "tarballDir" and "pkgRoot" options', async t => {
-  t.deepEqual(await verify({npmPublish: true, tarballDir: 'release', pkgRoot: 'dist'}, {}, t.context.logger), []);
+test('Verify "npmPublish", "tarballDir", "pkgRoot" and "otpUrl" options', async t => {
+  t.deepEqual(await verify({npmPublish: true, tarballDir: 'release', pkgRoot: 'dist', otpUrl: 'http://0.0.0.0/my-otp-provider'}, {}, t.context.logger), []);
 });
 
 test('Return SemanticReleaseError if "npmPublish" option is not a Boolean', async t => {
@@ -36,6 +36,14 @@ test('Return SemanticReleaseError if "pkgRoot" option is not a String', async t
   t.is(error.code, 'EINVALIDPKGROOT');
 });
 
+test('Return SemanticReleaseError if "otpUrl" option is not a String', async t => {
+  const otpUrl = 42;
+  const [error] = await verify({otpUrl}, {}, t.context.logger);
+
+  t.is(error.name, 'SemanticReleaseError');
+  t.is(error.code, 'EINVALIDOTPURL');
+});
+
 test('Return SemanticReleaseError Array if multiple config are invalid', async t => {
   const npmPublish = 42;
   const tarballDir = 42;