Fix missing `Branches` link on the project pagebvl-fix-missing-branches-link

2 files changed, 41 insertions, 7 deletions

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 7447197ed89..e1e70a53709 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -21,7 +21,7 @@
       %li
         = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
           #{n_('Commit', 'Commits', @project.statistics.commit_count)} (#{number_with_delimiter(@project.statistics.commit_count)})
-      %l
+      %li
         = link_to namespace_project_branches_path(@project.namespace, @project) do
           #{n_('Branch', 'Branches', @repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
       %li
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 7e8a703db93..97607d220aa 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -6,7 +6,7 @@ feature 'Project', feature: true do
     let(:path)    { namespace_project_path(project.namespace, project) }
 
     before do
-      gitlab_sign_in(:admin)
+      login_as(create(:admin))
     end
 
     it 'parses Markdown' do
@@ -39,7 +39,7 @@ feature 'Project', feature: true do
     let(:project) { create(:empty_project, namespace: user.namespace) }
 
     before do
-      gitlab_sign_in user
+      login_as user
       create(:forked_project_link, forked_to_project: project)
       visit edit_namespace_project_path(project.namespace, project)
     end
@@ -60,7 +60,7 @@ feature 'Project', feature: true do
     let(:project) { create(:empty_project, namespace: user.namespace, name: 'project1') }
 
     before do
-      gitlab_sign_in(user)
+      login_as(user)
       project.team << [user, :master]
       visit edit_namespace_project_path(project.namespace, project)
     end
@@ -79,7 +79,7 @@ feature 'Project', feature: true do
     let(:project) { create(:empty_project, namespace: user.namespace) }
 
     before do
-      gitlab_sign_in(user)
+      login_as(user)
       project.add_user(user, Gitlab::Access::MASTER)
       visit namespace_project_path(project.namespace, project)
     end
@@ -98,7 +98,7 @@ feature 'Project', feature: true do
 
     context 'on issues page', js: true do
       before do
-        gitlab_sign_in(user)
+        login_as(user)
         project.add_user(user, Gitlab::Access::MASTER)
         project2.add_user(user, Gitlab::Access::MASTER)
         visit namespace_project_issue_path(project.namespace, project, issue)
@@ -117,13 +117,47 @@ feature 'Project', feature: true do
     end
   end
 
+  describe 'project stats' do
+    let(:user) { create(:user) }
+    let(:project) { create(:project, namespace: user.namespace) }
+
+    before do
+      login_as user
+      visit namespace_project_path(project.namespace, project)
+    end
+
+    it 'has a files badge' do
+      page.within('.project-stats') do
+        expect(page).to have_link('Files')
+      end
+    end
+
+    it 'has a commits badge' do
+      page.within('.project-stats') do
+        expect(page).to have_link('Commits')
+      end
+    end
+
+    it 'has a branches badge' do
+      page.within('.project-stats') do
+        expect(page).to have_link('Branches')
+      end
+    end
+
+    it 'has a tags badge' do
+      page.within('.project-stats') do
+        expect(page).to have_link('Tags')
+      end
+    end
+  end
+
   describe 'tree view (default view is set to Files)' do
     let(:user) { create(:user, project_view: 'files') }
     let(:project) { create(:forked_project_with_submodules) }
 
     before do
       project.team << [user, :master]
-      gitlab_sign_in user
+      login_as user
       visit namespace_project_path(project.namespace, project)
     end