Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/graphql/mutations/environments/canary_ingress/update_spec.rb b/spec/graphql/mutations/environments/canary_ingress/update_spec.rb
index 48e55828a6b..fdf9cbaf25b 100644
--- a/spec/graphql/mutations/environments/canary_ingress/update_spec.rb
+++ b/spec/graphql/mutations/environments/canary_ingress/update_spec.rb
@@ -36,6 +36,20 @@ RSpec.describe Mutations::Environments::CanaryIngress::Update do
       it 'returns no errors' do
         expect(subject[:errors]).to be_empty
       end
+
+      context 'with certificate_based_clusters disabled' do
+        before do
+          stub_feature_flags(certificate_based_clusters: false)
+        end
+
+        it 'returns notice about feature removal' do
+          expect(subject[:errors]).to match_array([
+            'This endpoint was deactivated as part of the certificate-based' \
+            'kubernetes integration removal. See Epic:' \
+            'https://gitlab.com/groups/gitlab-org/configure/-/epics/8'
+          ])
+        end
+      end
     end
 
     context 'when service encounters a problem' do