Merge branch '29010-perf-bar' into 'master'

Add an optional performance bar to view performance metrics for the current page

Closes #29010

See merge request !11439

2 files changed, 82 insertions, 1 deletions

diff --git a/spec/features/user_can_display_performance_bar_spec.rb b/spec/features/user_can_display_performance_bar_spec.rb
new file mode 100644
index 00000000000..c2842255b86
--- /dev/null
+++ b/spec/features/user_can_display_performance_bar_spec.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+describe 'User can display performacne bar', :js do
+  shared_examples 'performance bar is disabled' do
+    it 'does not show the performance bar by default' do
+      expect(page).not_to have_css('#peek')
+    end
+
+    context 'when user press `pb`' do
+      before do
+        find('body').native.send_keys('pb')
+      end
+
+      it 'does not show the performance bar by default' do
+        expect(page).not_to have_css('#peek')
+      end
+    end
+  end
+
+  shared_examples 'performance bar is enabled' do
+    it 'does not show the performance bar by default' do
+      expect(page).not_to have_css('#peek')
+    end
+
+    context 'when user press `pb`' do
+      before do
+        find('body').native.send_keys('pb')
+      end
+
+      it 'does not show the performance bar by default' do
+        expect(page).not_to have_css('#peek')
+      end
+    end
+  end
+
+  context 'when user is logged-out' do
+    before do
+      visit root_path
+    end
+
+    context 'when the gitlab_performance_bar feature is disabled' do
+      before do
+        Feature.disable('gitlab_performance_bar')
+      end
+
+      it_behaves_like 'performance bar is disabled'
+    end
+
+    context 'when the gitlab_performance_bar feature is enabled' do
+      before do
+        Feature.enable('gitlab_performance_bar')
+      end
+
+      it_behaves_like 'performance bar is disabled'
+    end
+  end
+
+  context 'when user is logged-in' do
+    before do
+      login_as :user
+
+      visit root_path
+    end
+
+    context 'when the gitlab_performance_bar feature is disabled' do
+      before do
+        Feature.disable('gitlab_performance_bar')
+      end
+
+      it_behaves_like 'performance bar is disabled'
+    end
+
+    context 'when the gitlab_performance_bar feature is enabled' do
+      before do
+        Feature.enable('gitlab_performance_bar')
+      end
+
+      it_behaves_like 'performance bar is enabled'
+    end
+  end
+end
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 140fd2720bf..ba247dcc5cf 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -20,8 +20,8 @@ describe Commit, models: true do
     end
 
     it 'caches the author' do
+      allow(RequestStore).to receive(:active?).and_return(true)
       user = create(:user, email: commit.author_email)
-      expect(RequestStore).to receive(:active?).twice.and_return(true)
       expect_any_instance_of(Commit).to receive(:find_author_by_any_email).and_call_original
 
       expect(commit.author).to eq(user)