Merge branch '34643-fix-project-path-slugify' into 'master'

Fix CI_PROJECT_PATH_SLUG slugify

Closes #34643

See merge request !13350

2 files changed, 16 insertions, 2 deletions

diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index 111c873f79c..92787bb262e 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -1,7 +1,21 @@
 require 'spec_helper'
 
 describe Gitlab::Utils do
-  delegate :to_boolean, :boolean_to_yes_no, to: :described_class
+  delegate :to_boolean, :boolean_to_yes_no, :slugify, to: :described_class
+
+  describe '.slugify' do
+    {
+      'TEST' => 'test',
+      'project_with_underscores' => 'project-with-underscores',
+      'namespace/project' =>  'namespace-project',
+      'a' * 70 => 'a' * 63,
+      'test_trailing_' => 'test-trailing'
+    }.each do |original, expected|
+      it "slugifies #{original} to #{expected}" do
+        expect(slugify(original)).to eq(expected)
+      end
+    end
+  end
 
   describe '.to_boolean' do
     it 'accepts booleans' do
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 86afa856ea7..767f0ad9e65 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1220,7 +1220,7 @@ describe Ci::Build do
         { key: 'CI_PROJECT_ID', value: project.id.to_s, public: true },
         { key: 'CI_PROJECT_NAME', value: project.path, public: true },
         { key: 'CI_PROJECT_PATH', value: project.full_path, public: true },
-        { key: 'CI_PROJECT_PATH_SLUG', value: project.full_path.parameterize, public: true },
+        { key: 'CI_PROJECT_PATH_SLUG', value: project.full_path_slug, public: true },
         { key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true },
         { key: 'CI_PROJECT_URL', value: project.web_url, public: true },
         { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true },