Read about our upcoming Code of Conduct on this issue

Commit 0b18023c authored by Stan Hu's avatar Stan Hu
Browse files

Avoid regenerating the ref path for the environment

Closes #39752
parent 5ab95ecb09e2
......@@ -110,7 +110,7 @@ def first_deployment_for(commit)
end
def ref_path
"refs/#{Repository::REF_ENVIRONMENTS}/#{generate_slug}"
"refs/#{Repository::REF_ENVIRONMENTS}/#{slug}"
end
def formatted_external_url
......@@ -164,6 +164,10 @@ def additional_metrics
end
end
def slug
super.presence || generate_slug
end
# An environment name is not necessarily suitable for use in URLs, DNS
# or other third-party contexts, so provide a slugified version. A slug has
# the following properties:
......
---
title: Avoid regenerating the ref path for the environment
merge_request:
author:
type: fixed
......@@ -547,6 +547,15 @@
expect(environment.slug).to eq(original_slug)
end
it "regenerates the slug if nil" do
environment = build(:environment, slug: nil)
new_slug = environment.slug
expect(new_slug).not_to be_nil
expect(environment.slug).to eq(new_slug)
end
end
describe '#generate_slug' do
......@@ -583,6 +592,12 @@
it 'returns a path that uses the slug and does not have spaces' do
expect(environment.ref_path).to start_with('refs/environments/staging-review-1-')
end
it "doesn't change when the slug is nil initially" do
environment.slug = nil
expect(environment.ref_path).to eq(environment.ref_path)
end
end
describe '#external_url_for' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment