Merge branch 'master' into refactor-clusters

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index e1be23541e8..f75de0a0d88 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -547,6 +547,15 @@ describe Environment do
 
       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 @@ describe Environment do
     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