Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 5 deletions

diff --git a/spec/views/projects/commits/_commit.html.haml_spec.rb b/spec/views/projects/commits/_commit.html.haml_spec.rb
index 669bb596de5..1c01a7f9a9c 100644
--- a/spec/views/projects/commits/_commit.html.haml_spec.rb
+++ b/spec/views/projects/commits/_commit.html.haml_spec.rb
@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe 'projects/commits/_commit.html.haml' do
+  let(:template) { 'projects/commits/commit.html.haml' }
   let(:project) { create(:project, :repository) }
   let(:commit) { project.repository.commit(ref) }
 
@@ -14,7 +15,7 @@ describe 'projects/commits/_commit.html.haml' do
     let(:ref) { GpgHelpers::SIGNED_COMMIT_SHA }
 
     it 'does not display a loading spinner for GPG status' do
-      render partial: 'projects/commits/commit', locals: {
+      render partial: template, locals: {
         project: project,
         ref: ref,
         commit: commit
@@ -50,7 +51,7 @@ describe 'projects/commits/_commit.html.haml' do
       end
 
       it 'does not display a ci status icon' do
-        render partial: 'projects/commits/commit', locals: {
+        render partial: template, locals: {
           project: project,
           ref: ref,
           commit: commit
@@ -66,7 +67,7 @@ describe 'projects/commits/_commit.html.haml' do
       end
 
       it 'does display a ci status icon when pipelines are enabled' do
-        render partial: 'projects/commits/commit', locals: {
+        render partial: template, locals: {
           project: project,
           ref: ref,
           commit: commit
diff --git a/spec/views/projects/show.html.haml_spec.rb b/spec/views/projects/show.html.haml_spec.rb
index 4f5f0f0285c..c28260f422c 100644
--- a/spec/views/projects/show.html.haml_spec.rb
+++ b/spec/views/projects/show.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'projects/show' do
+describe 'projects/show.html.haml' do
   include Devise::Test::ControllerHelpers
 
   let(:user) { create(:admin) }
diff --git a/spec/views/projects/tags/index.html.haml_spec.rb b/spec/views/projects/tags/index.html.haml_spec.rb
index 66be085c290..08fbada9c9c 100644
--- a/spec/views/projects/tags/index.html.haml_spec.rb
+++ b/spec/views/projects/tags/index.html.haml_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'projects/tags/index' do
+describe 'projects/tags/index.html.haml' do
   let(:project)  { create(:project, :repository) }
   let(:tags)     { TagsFinder.new(project.repository, {}).execute }
   let(:git_tag)  { project.repository.tags.last }