Merge branch...

Merge branch '243550-missing-slash-in-registry-setup-section-of-npm-module-in-gitlab-registry' into 'master'

Add Missing slash in 'Registry setup' section of npm packages

See merge request gitlab-org/gitlab!42360

app/assets/javascripts/packages/details/store/getters.js

@@ -84,10 +84,10 @@ export const npmSetupCommand = ({ packageEntity, npmPath }) => (type = NpmManage
   const scope = packageEntity.name.substring(0, packageEntity.name.indexOf('/'));
 
   if (type === NpmManager.NPM) {
-    return `echo ${scope}:registry=${npmPath} >> .npmrc`;
+    return `echo ${scope}:registry=${npmPath}/ >> .npmrc`;
   }
 
-  return `echo \\"${scope}:registry\\" \\"${npmPath}\\" >> .yarnrc`;
+  return `echo \\"${scope}:registry\\" \\"${npmPath}/\\" >> .yarnrc`;
 };
 
 export const nugetInstallationCommand = ({ packageEntity }) =>

changelogs/unreleased/243550-missing-slash-in-registry-setup-section-of-npm-module-in-gitlab-re.yml

+---
+title: Add Missing slash in 'Registry setup' section of npm packages
+merge_request: 42360
+author:
+type: changed

spec/frontend/packages/details/components/__snapshots__/npm_installation_spec.js.snap

@@ -32,7 +32,7 @@ exports[`NpmInstallation renders all the messages 1`] = `
    
   <code-instruction-stub
     copytext="Copy npm setup command"
-    instruction="echo @Test:registry=undefined >> .npmrc"
+    instruction="echo @Test:registry=undefined/ >> .npmrc"
     label="npm command"
     trackingaction="copy_npm_setup_command"
     trackinglabel="code_instruction"
@@ -40,7 +40,7 @@ exports[`NpmInstallation renders all the messages 1`] = `
    
   <code-instruction-stub
     copytext="Copy yarn setup command"
-    instruction="echo \\\\\\"@Test:registry\\\\\\" \\\\\\"undefined\\\\\\" >> .yarnrc"
+    instruction="echo \\\\\\"@Test:registry\\\\\\" \\\\\\"undefined/\\\\\\" >> .yarnrc"
     label="yarn command"
     trackingaction="copy_yarn_setup_command"
     trackinglabel="code_instruction"

spec/frontend/packages/details/components/npm_installation_spec.js

@@ -78,7 +78,7 @@ describe('NpmInstallation', () => {
           .at(2)
           .props(),
       ).toMatchObject({
-        instruction: 'echo @Test:registry=undefined >> .npmrc',
+        instruction: 'echo @Test:registry=undefined/ >> .npmrc',
         multiline: false,
         trackingAction: TrackingActions.COPY_NPM_SETUP_COMMAND,
       });
@@ -90,7 +90,7 @@ describe('NpmInstallation', () => {
           .at(3)
           .props(),
       ).toMatchObject({
-        instruction: 'echo \\"@Test:registry\\" \\"undefined\\" >> .yarnrc',
+        instruction: 'echo \\"@Test:registry\\" \\"undefined/\\" >> .yarnrc',
         multiline: false,
         trackingAction: TrackingActions.COPY_YARN_SETUP_COMMAND,
       });

spec/frontend/packages/details/store/getters_spec.js

@@ -62,9 +62,9 @@ describe('Getters PackageDetails Store', () => {
   const mavenSetupXmlBlock = generateMavenSetupXml();
 
   const npmInstallStr = `npm i ${npmPackage.name}`;
-  const npmSetupStr = `echo @Test:registry=${registryUrl} >> .npmrc`;
+  const npmSetupStr = `echo @Test:registry=${registryUrl}/ >> .npmrc`;
   const yarnInstallStr = `yarn add ${npmPackage.name}`;
-  const yarnSetupStr = `echo \\"@Test:registry\\" \\"${registryUrl}\\" >> .yarnrc`;
+  const yarnSetupStr = `echo \\"@Test:registry\\" \\"${registryUrl}/\\" >> .yarnrc`;
 
   const nugetInstallationCommandStr = `nuget install ${nugetPackage.name} -Source "GitLab"`;
   const nugetSetupCommandStr = `nuget source Add -Name "GitLab" -Source "${registryUrl}" -UserName <your_username> -Password <your_token>`;