Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 72143d69fc8..48cabd4301c 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -1264,6 +1264,14 @@ describe Environment, :use_clean_rails_memory_store_caching do
     end
   end
 
+  describe '.for_id_and_slug' do
+    subject { described_class.for_id_and_slug(environment.id, environment.slug) }
+
+    let(:environment) { create(:environment) }
+
+    it { is_expected.not_to be_nil }
+  end
+
   describe '.find_or_create_by_name' do
     it 'finds an existing environment if it exists' do
       env = create(:environment)