Merge branch 'project-overview-layout-reorganisation' into 'master'

Project overview page reoganisation: add sidebar

See merge request gitlab-org/gitlab!137025



Merged-by: Sascha Eggenberger <seggenberger@gitlab.com>
Approved-by: Julia Miocene <jmiocene@gitlab.com>
Approved-by: Elwyn Benson <ebenson@gitlab.com>
Reviewed-by: Sascha Eggenberger <seggenberger@gitlab.com>
Reviewed-by: Elwyn Benson <ebenson@gitlab.com>
Co-authored-by: Annabel Dunstone Gray <annabel.dunstone@gmail.com>

spec/features/projects_spec.rb

@@ -12,6 +12,7 @@
     before do
       sign_in user
       visit new_project_path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     shared_examples 'creates from template' do |template, sub_template_tab = nil|
@@ -99,6 +100,7 @@
 
     before do
       sign_in(project.first_owner)
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     it 'parses Markdown' do
@@ -164,6 +166,7 @@
     before do
       sign_in(project.first_owner)
       visit path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     it 'shows project topics' do
@@ -195,6 +198,7 @@
     before do
       sign_in(project.first_owner)
       visit path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     context 'desktop component' do
@@ -427,6 +431,10 @@
     let(:project) { create(:project, :repository) }
     let(:user) { create(:user) }
 
+    before do
+      stub_feature_flags(project_overview_reorg: false)
+    end
+
     it 'does not contain default branch information in its content', :js do
       default_branch = 'merge-commit-analyze-side-branch'
 

spec/frontend/read_more_spec.js

-import htmlProjectsOverview from 'test_fixtures/projects/overview.html';
 import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import initReadMore from '~/read_more';
 
@@ -11,7 +10,12 @@ describe('Read more click-to-expand functionality', () => {
 
   describe('expands target element', () => {
     beforeEach(() => {
-      setHTMLFixture(htmlProjectsOverview);
+      setHTMLFixture(`
+        <p class="read-more-container">Target</p>
+        <button type="button" class="js-read-more-trigger">
+          <span>Button text</span>
+        </button>
+      `);
     });
 
     it('adds "is-expanded" class to target element', () => {

spec/helpers/stat_anchors_helper_spec.rb

@@ -8,6 +8,10 @@
   describe '#stat_anchor_attrs' do
     subject { helper.stat_anchor_attrs(anchor) }
 
+    before do
+      stub_feature_flags(project_overview_reorg: false)
+    end
+
     context 'when anchor is a link' do
       let(:anchor) { anchor_klass.new(true) }
 

spec/presenters/project_presenter_spec.rb

@@ -428,6 +428,10 @@
     end
 
     describe '#new_file_anchor_data' do
+      before do
+        stub_feature_flags(project_overview_reorg: false)
+      end
+
       it 'returns new file data if user can push' do
         project.add_developer(user)
 
@@ -751,6 +755,7 @@
     subject(:empty_repo_statistics_buttons) { presenter.empty_repo_statistics_buttons }
 
     before do
+      stub_feature_flags(project_overview_reorg: false)
       allow(project).to receive(:auto_devops_enabled?).and_return(false)
     end
 

spec/views/projects/_files.html.haml_spec.rb

@@ -35,6 +35,8 @@
     before do
       allow(view).to receive(:current_user).and_return(user)
       allow(user).to receive(:project_shortcut_buttons).and_return(true)
+
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     it 'renders buttons' do
@@ -45,6 +47,10 @@
   end
 
   context 'when rendered in the project overview page and there is no current user' do
+    before do
+      stub_feature_flags(project_overview_reorg: false)
+    end
+
     it 'renders buttons' do
       render(template, is_project_overview: true)
 

spec/views/projects/_home_panel.html.haml_spec.rb

@@ -100,6 +100,8 @@
       allow(view).to receive(:current_user).and_return(user)
       allow(view).to receive(:can?).with(user, :read_project, project).and_return(false)
       allow(project).to receive(:license_anchor_data).and_return(false)
+
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     context 'has no badges' do