cleaning

Author: hindicator

packages/acceptance-tests/pkg-tests-specs/sources/commands/publish.test.ts

@@ -1,3 +1,6 @@
+import {httpUtils}  from '@yarnpkg/core';
+import {npath, xfs} from '@yarnpkg/fslib';
+
 export {};
 
 const {
@@ -68,4 +71,23 @@ describe(`publish`, () =>   {
       },
     })).resolves.toBeTruthy();
   }));
+
+  test(`should publish package with readme content`, makeTemporaryEnv({
+    name: `otp-required`,
+    version: `1.0.0`,
+  }, async ({path, run, source}) => {
+    const spy = jest.spyOn(httpUtils, `put`);
+    await run(`install`);
+
+    const readmePath = npath.toPortablePath(`${path}/README.md`);
+    await xfs.writeFilePromise(readmePath, `# title\n`);
+
+    const res = await run(`npm`, `publish`, `--otp`, validLogins.otpUser.npmOtpToken, {
+      env: {
+        YARN_NPM_AUTH_TOKEN: validLogins.otpUser.npmAuthToken,
+      },
+    });
+
+    expect(spy).toHaveBeenCalledWith({});
+  }));
 });

packages/plugin-npm/sources/npmPublishUtils.ts

@@ -87,19 +87,19 @@ export async function getGitHead(workingDir: PortablePath) {
 
 export function getPublishAccess(workspace: Workspace, ident: Ident, access?: string): string {
   const configuration = workspace.project.configuration;
+  if (typeof access === `string`)
+    return access;
 
-  if (typeof access === `undefined`) {
-    if (workspace.manifest.publishConfig && typeof workspace.manifest.publishConfig.access === `string`) {
-      access = workspace.manifest.publishConfig.access;
-    } else if (configuration.get(`npmPublishAccess`) !== null) {
-      access = configuration.get(`npmPublishAccess`)!;
-    } else if (ident.scope) {
-      access = `restricted`;
-    } else {
-      access = `public`;
-    }
-  }
-  return access;
+  if (workspace.manifest.publishConfig && typeof workspace.manifest.publishConfig.access === `string`)
+    return workspace.manifest.publishConfig.access;
+
+  if (configuration.get(`npmPublishAccess`) !== null)
+    return configuration.get(`npmPublishAccess`)!;
+
+  if (ident.scope)
+    access = `restricted`;
+
+  return `public`;
 }
 
 export async function getReadmeContent(workspace: Workspace): Promise<string>  {