Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 16 deletions

diff --git a/spec/views/projects/commits/_commit.html.haml_spec.rb b/spec/views/projects/commits/_commit.html.haml_spec.rb
index da93871e0e4..2ca23d4cb2d 100644
--- a/spec/views/projects/commits/_commit.html.haml_spec.rb
+++ b/spec/views/projects/commits/_commit.html.haml_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'projects/commits/_commit.html.haml' do
-  let(:template) { 'projects/commits/commit.html.haml' }
+  let(:template) { 'projects/commits/commit' }
   let(:project) { create(:project, :repository) }
   let(:commit) { project.repository.commit(ref) }
 
diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb
index 8242d20a9e7..2ea3dc9f76a 100644
--- a/spec/views/projects/jobs/show.html.haml_spec.rb
+++ b/spec/views/projects/jobs/show.html.haml_spec.rb
@@ -27,7 +27,6 @@ RSpec.describe 'projects/jobs/show' do
 
     it 'shows job vue app' do
       expect(rendered).to have_css('#js-job-page')
-      expect(rendered).not_to have_css('#js-bridge-page')
     end
 
     context 'when job is running' do
@@ -42,18 +41,4 @@ RSpec.describe 'projects/jobs/show' do
       end
     end
   end
-
-  context 'when showing a bridge job' do
-    let(:bridge) { create(:ci_bridge, status: :pending) }
-
-    before do
-      assign(:build, bridge)
-      render
-    end
-
-    it 'shows bridge vue app' do
-      expect(rendered).to have_css('#js-bridge-page')
-      expect(rendered).not_to have_css('#js-job-page')
-    end
-  end
 end