Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 16 deletions

diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb
index 8853b34074a..664c8b7432e 100644
--- a/spec/views/projects/settings/operations/show.html.haml_spec.rb
+++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb
@@ -10,10 +10,6 @@ RSpec.describe 'projects/settings/operations/show' do
     create(:project_error_tracking_setting, project: project)
   end
 
-  let_it_be_with_reload(:tracing_setting) do
-    create(:project_tracing_setting, project: project)
-  end
-
   let_it_be(:prometheus_integration) { create(:prometheus_integration, project: project) }
 
   before_all do
@@ -25,8 +21,6 @@ RSpec.describe 'projects/settings/operations/show' do
 
     allow(view).to receive(:error_tracking_setting)
       .and_return(error_tracking_setting)
-    allow(view).to receive(:tracing_setting)
-      .and_return(tracing_setting)
     allow(view).to receive(:prometheus_integration)
       .and_return(prometheus_integration)
     allow(view).to receive(:current_user).and_return(user)
@@ -51,14 +45,4 @@ RSpec.describe 'projects/settings/operations/show' do
       end
     end
   end
-
-  describe 'Operations > Tracing' do
-    context 'Settings page ' do
-      it 'renders the Tracing Settings page' do
-        render
-
-        expect(rendered).to have_content _('Embed an image of your existing Jaeger server in GitLab.')
-      end
-    end
-  end
 end