Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 28 deletions

diff --git a/spec/services/issues/zoom_link_service_spec.rb b/spec/services/issues/zoom_link_service_spec.rb
index baa6d774864..595d06d5331 100644
--- a/spec/services/issues/zoom_link_service_spec.rb
+++ b/spec/services/issues/zoom_link_service_spec.rb
@@ -38,12 +38,6 @@ describe Issues::ZoomLinkService do
     end
   end
 
-  shared_context 'feature flag disabled' do
-    before do
-      stub_feature_flags(issue_zoom_integration: false)
-    end
-  end
-
   shared_context 'insufficient permissions' do
     before do
       project.add_guest(user)
@@ -78,11 +72,6 @@ describe Issues::ZoomLinkService do
         include_examples 'cannot add link'
       end
 
-      context 'when feature flag is disabled' do
-        include_context 'feature flag disabled'
-        include_examples 'cannot add link'
-      end
-
       context 'with insufficient permissions' do
         include_context 'insufficient permissions'
         include_examples 'cannot add link'
@@ -113,12 +102,6 @@ describe Issues::ZoomLinkService do
 
       it { is_expected.to eq(true) }
 
-      context 'when feature flag is disabled' do
-        include_context 'feature flag disabled'
-
-        it { is_expected.to eq(false) }
-      end
-
       context 'with insufficient permissions' do
         include_context 'insufficient permissions'
 
@@ -152,11 +135,6 @@ describe Issues::ZoomLinkService do
           .to eq(issue.description.delete_suffix("\n\n#{zoom_link}"))
       end
 
-      context 'when feature flag is disabled' do
-        include_context 'feature flag disabled'
-        include_examples 'cannot remove link'
-      end
-
       context 'with insufficient permissions' do
         include_context 'insufficient permissions'
         include_examples 'cannot remove link'
@@ -187,12 +165,6 @@ describe Issues::ZoomLinkService do
 
       it { is_expected.to eq(true) }
 
-      context 'when feature flag is disabled' do
-        include_context 'feature flag disabled'
-
-        it { is_expected.to eq(false) }
-      end
-
       context 'with insufficient permissions' do
         include_context 'insufficient permissions'