Merge branch '321420-spell-npm-with-lowercase-letters-in-package-registry-ui' into 'master'

Spell "npm" with lowercase letters in Package Registry UI

See merge request gitlab-org/gitlab!54163

app/assets/javascripts/packages/list/constants.js

@@ -71,7 +71,7 @@ export const PACKAGE_TYPES = [
     type: PackageType.MAVEN,
   },
   {
-    title: s__('PackageRegistry|NPM'),
+    title: s__('PackageRegistry|npm'),
     type: PackageType.NPM,
   },
   {

app/assets/javascripts/packages/shared/utils.js

@@ -14,7 +14,7 @@ export const getPackageTypeLabel = (packageType) => {
     case PackageType.MAVEN:
       return s__('PackageType|Maven');
     case PackageType.NPM:
-      return s__('PackageType|NPM');
+      return s__('PackageType|npm');
     case PackageType.NUGET:
       return s__('PackageType|NuGet');
     case PackageType.PYPI:

app/views/admin/application_settings/_package_registry.html.haml

@@ -36,7 +36,7 @@
                     = f.label :maven_max_file_size, _('Maximum Maven package file size in bytes'), class: 'label-bold'
                     = f.number_field :maven_max_file_size, class: 'form-control gl-form-input'
                   .form-group
-                    = f.label :npm_max_file_size, _('Maximum NPM package file size in bytes'), class: 'label-bold'
+                    = f.label :npm_max_file_size, _('Maximum npm package file size in bytes'), class: 'label-bold'
                     = f.number_field :npm_max_file_size, class: 'form-control gl-form-input'
                   .form-group
                     = f.label :nuget_max_file_size, _('Maximum NuGet package file size in bytes'), class: 'label-bold'

changelogs/unreleased/321420-spell-npm-with-lowercase-letters-in-package-registry-ui.yml

+---
+title: Spell "npm" with lowercase letters in Package Registry UI
+merge_request: 54163
+author: Simon Stieger @sim0
+type: other

ee/app/views/admin/application_settings/_ee_package_registry.haml

@@ -7,8 +7,8 @@
         .form-check
           = f.check_box :npm_package_requests_forwarding, class: 'form-check-input'
           = f.label :npm_package_requests_forwarding, class: 'form-check-label' do
-            Enable forwarding of NPM package requests to npmjs.org
+            Enable forwarding of npm package requests to npmjs.org
             .form-text.text-muted
-              = _("When enabled, if an NPM package isn't found in the GitLab Registry, we will attempt to pull from the global NPM registry.")
+              = _("When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry.")
 
     = f.submit _('Save changes'), class: 'btn gl-button btn-success'

ee/spec/features/admin/admin_settings_spec.rb

@@ -250,7 +250,7 @@ RSpec.describe 'Admin updates EE-only settings' do
 
     it 'allows you to change the npm_forwaring setting' do
       page.within('#js-package-settings') do
-        check 'Enable forwarding of NPM package requests to npmjs.org'
+        check 'Enable forwarding of npm package requests to npmjs.org'
         click_button 'Save'
       end
 

locale/gitlab.pot

@@ -18215,9 +18215,6 @@ msgstr ""
 msgid "Maximum Maven package file size in bytes"
 msgstr ""
 
-msgid "Maximum NPM package file size in bytes"
-msgstr ""
-
 msgid "Maximum NuGet package file size in bytes"
 msgstr ""
 
@@ -18275,6 +18272,9 @@ msgstr ""
 msgid "Maximum lifetime allowable for Personal Access Tokens is active, your expire date must be set before %{maximum_allowable_date}."
 msgstr ""
 
+msgid "Maximum npm package file size in bytes"
+msgstr ""
+
 msgid "Maximum number of %{name} (%{count}) exceeded"
 msgstr ""
 
@@ -21263,9 +21263,6 @@ msgstr ""
 msgid "PackageRegistry|Maven XML"
 msgstr ""
 
-msgid "PackageRegistry|NPM"
-msgstr ""
-
 msgid "PackageRegistry|NuGet"
 msgstr ""
 
@@ -21350,6 +21347,9 @@ msgstr ""
 msgid "PackageRegistry|You may also need to setup authentication using an auth token. %{linkStart}See the documentation%{linkEnd} to find out more."
 msgstr ""
 
+msgid "PackageRegistry|npm"
+msgstr ""
+
 msgid "PackageRegistry|npm command"
 msgstr ""
 
@@ -21371,15 +21371,15 @@ msgstr ""
 msgid "PackageType|Maven"
 msgstr ""
 
-msgid "PackageType|NPM"
-msgstr ""
-
 msgid "PackageType|NuGet"
 msgstr ""
 
 msgid "PackageType|PyPI"
 msgstr ""
 
+msgid "PackageType|npm"
+msgstr ""
+
 msgid "Packages"
 msgstr ""
 
@@ -33259,7 +33259,7 @@ msgstr ""
 msgid "When enabled, any user visiting %{host} will be able to create an account."
 msgstr ""
 
-msgid "When enabled, if an NPM package isn't found in the GitLab Registry, we will attempt to pull from the global NPM registry."
+msgid "When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry."
 msgstr ""
 
 msgid "When enabled, users cannot use GitLab until the terms have been accepted."

qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Package', :orchestrated, :packages do
-    describe 'NPM registry' do
+    describe 'npm registry' do
       include Runtime::Fixtures
 
       let(:registry_scope) { project.group.sandbox.path }
@@ -31,7 +31,7 @@ module QA
             {
               "name": "#{package_name}",
               "version": "1.0.0",
-              "description": "Example package for GitLab NPM registry",
+              "description": "Example package for GitLab npm registry",
               "publishConfig": {
                 "@#{registry_scope}:registry": "#{gitlab_address_with_port}/api/v4/projects/#{project.id}/packages/npm/"
               }

qa/qa/specs/features/ee/browser_ui/geo/geo_replication_npm_registry_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Geo', :orchestrated, :geo do
-    describe 'NPM registry' do
+    describe 'npm registry' do
       include Runtime::Fixtures
 
       let(:uri) { URI.parse(Runtime::Scenario.gitlab_address) }
@@ -15,7 +15,7 @@ module QA
       let(:project) do
         Resource::Project.fabricate_via_api! do |project|
           project.name = 'geo-npm-package-project'
-          project.description = 'Geo project for NPM package replication test'
+          project.description = 'Geo project for npm package replication test'
         end
       end
 
@@ -32,7 +32,7 @@ module QA
             {
               "name": "#{package_name}",
               "version": "#{version}",
-              "description": "Example package for GitLab NPM registry",
+              "description": "Example package for GitLab npm registry",
               "publishConfig": {
                 "@#{registry_scope}:registry": "#{gitlab_address_with_port}/api/v4/projects/#{project.id}/packages/npm/"
               }
@@ -53,7 +53,7 @@ module QA
       end
 
       # Test code is based on qa/specs/features/browser_ui/5_package/npm_registry_spec.rb
-      it 'replicates NPM registry to secondary Geo site', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1026' do
+      it 'replicates npm registry to secondary Geo site', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1026' do
         # Use a Node Docker container to publish the package
         with_fixtures([npmrc, package_json]) do |dir|
           Service::DockerRun::NodeJs.new(dir).publish!

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

@@ -99,7 +99,7 @@ describe('Getters PackageDetails Store', () => {
       packageEntity              | expectedResult
       ${conanPackage}            | ${'Conan'}
       ${packageWithoutBuildInfo} | ${'Maven'}
-      ${npmPackage}              | ${'NPM'}
+      ${npmPackage}              | ${'npm'}
       ${nugetPackage}            | ${'NuGet'}
       ${pypiPackage}             | ${'PyPI'}
     `(`package type`, ({ packageEntity, expectedResult }) => {
@@ -168,13 +168,13 @@ describe('Getters PackageDetails Store', () => {
   });
 
   describe('npm string getters', () => {
-    it('gets the correct npmInstallationCommand for NPM', () => {
+    it('gets the correct npmInstallationCommand for npm', () => {
       setupState({ packageEntity: npmPackage });
 
       expect(npmInstallationCommand(state)(NpmManager.NPM)).toBe(npmInstallStr);
     });
 
-    it('gets the correct npmSetupCommand for NPM', () => {
+    it('gets the correct npmSetupCommand for npm', () => {
       setupState({ packageEntity: npmPackage });
 
       expect(npmSetupCommand(state)(NpmManager.NPM)).toBe(npmSetupStr);

spec/frontend/packages/shared/utils_spec.js

@@ -35,7 +35,7 @@ describe('Packages shared utils', () => {
       packageType   | expectedResult
       ${'conan'}    | ${'Conan'}
       ${'maven'}    | ${'Maven'}
-      ${'npm'}      | ${'NPM'}
+      ${'npm'}      | ${'npm'}
       ${'nuget'}    | ${'NuGet'}
       ${'pypi'}     | ${'PyPI'}
       ${'composer'} | ${'Composer'}

spec/views/admin/application_settings/_package_registry.html.haml_spec.rb

@@ -30,8 +30,8 @@ RSpec.describe 'admin/application_settings/_package_registry' do
       expect(rendered).to have_field('Maximum Maven package file size in bytes', type: 'number')
       expect(page.find_field('Maximum Maven package file size in bytes').value).to eq(default_plan_limits.maven_max_file_size.to_s)
 
-      expect(rendered).to have_field('Maximum NPM package file size in bytes', type: 'number')
-      expect(page.find_field('Maximum NPM package file size in bytes').value).to eq(default_plan_limits.npm_max_file_size.to_s)
+      expect(rendered).to have_field('Maximum npm package file size in bytes', type: 'number')
+      expect(page.find_field('Maximum npm package file size in bytes').value).to eq(default_plan_limits.npm_max_file_size.to_s)
 
       expect(rendered).to have_field('Maximum NuGet package file size in bytes', type: 'number')
       expect(page.find_field('Maximum NuGet package file size in bytes').value).to eq(default_plan_limits.nuget_max_file_size.to_s)