Add latest changes from gitlab-org/gitlab@master

2 files changed, 129 insertions, 0 deletions

diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index b8efabb0cab..5364bc10b2f 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -171,6 +171,31 @@ describe "User browses files" do
     end
   end
 
+  context "when browsing a `improve/awesome` branch", :js do
+    before do
+      visit(project_tree_path(project, "improve/awesome"))
+    end
+
+    it "shows files from a repository" do
+      expect(page).to have_content("VERSION")
+        .and have_content(".gitignore")
+        .and have_content("LICENSE")
+    end
+  end
+
+  context "when browsing a `test-#` branch", :js do
+    before do
+      project.repository.create_branch('test-#', project.repository.root_ref)
+      visit(project_tree_path(project, "test-#"))
+    end
+
+    it "shows files from a repository" do
+      expect(page).to have_content("VERSION")
+        .and have_content(".gitignore")
+        .and have_content("LICENSE")
+    end
+  end
+
   context "when browsing a specific ref", :js do
     let(:ref) { project_tree_path(project, "6d39438") }
 
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
new file mode 100644
index 00000000000..f87bd5ca529
--- /dev/null
+++ b/spec/features/projects/navbar_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Project navbar' do
+  it_behaves_like 'verified navigation bar' do
+    let(:user) { create(:user) }
+    let(:project) { create(:project, :repository) }
+
+    let(:structure) do
+      [
+        {
+          nav_item: _('Project overview'),
+          nav_sub_items: [
+            _('Details'),
+            _('Activity'),
+            _('Releases')
+          ]
+        },
+        {
+          nav_item: _('Repository'),
+          nav_sub_items: [
+            _('Files'),
+            _('Commits'),
+            _('Branches'),
+            _('Tags'),
+            _('Contributors'),
+            _('Graph'),
+            _('Compare'),
+            (_('Locked Files') if Gitlab.ee?)
+          ]
+        },
+        {
+          nav_item: _('Issues'),
+          nav_sub_items: [
+            _('List'),
+            _('Boards'),
+            _('Labels'),
+            _('Milestones')
+          ]
+        },
+        {
+          nav_item: _('Merge Requests'),
+          nav_sub_items: []
+        },
+        {
+          nav_item: _('CI / CD'),
+          nav_sub_items: [
+            _('Pipelines'),
+            _('Jobs'),
+            _('Artifacts'),
+            _('Schedules')
+          ]
+        },
+        {
+          nav_item: _('Operations'),
+          nav_sub_items: [
+            _('Metrics'),
+            _('Environments'),
+            _('Error Tracking'),
+            _('Serverless'),
+            _('Kubernetes'),
+            _('Auto DevOps')
+          ]
+        },
+        {
+          nav_item: _('Analytics'),
+          nav_sub_items: [
+            (_('Code Review') if Gitlab.ee?),
+            _('Cycle Analytics'),
+            _('Repository Analytics')
+          ]
+        },
+        {
+          nav_item: _('Wiki'),
+          nav_sub_items: []
+        },
+        {
+          nav_item: _('Snippets'),
+          nav_sub_items: []
+        },
+        {
+          nav_item: _('Settings'),
+          nav_sub_items: [
+            _('General'),
+            _('Members'),
+            _('Integrations'),
+            _('Repository'),
+            _('CI / CD'),
+            _('Operations'),
+            (_('Audit Events') if Gitlab.ee?)
+          ].compact
+        }
+      ]
+    end
+
+    before do
+      project.add_maintainer(user)
+      sign_in(user)
+
+      visit project_path(project)
+    end
+  end
+end