Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 13 insertions, 1 deletions

diff --git a/spec/finders/environments/environments_by_deployments_finder_spec.rb b/spec/finders/environments/environments_by_deployments_finder_spec.rb
index 1b86aced67d..7804ffa4ef1 100644
--- a/spec/finders/environments/environments_by_deployments_finder_spec.rb
+++ b/spec/finders/environments/environments_by_deployments_finder_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Environments::EnvironmentsByDeploymentsFinder do
     project.add_maintainer(user)
   end
 
-  describe '#execute' do
+  shared_examples 'execute' do
     context 'tagged deployment' do
       let(:environment_two) { create(:environment, project: project) }
       # Environments need to include commits, so rewind two commits to fit
@@ -124,4 +124,16 @@ RSpec.describe Environments::EnvironmentsByDeploymentsFinder do
       end
     end
   end
+
+  describe "#execute" do
+    include_examples 'execute'
+
+    context 'when environments_by_deployments_finder_exists_optimization is disabled' do
+      before do
+        stub_feature_flags(environments_by_deployments_finder_exists_optimization: false)
+      end
+
+      include_examples 'execute'
+    end
+  end
 end