From 9fc63aa7f65ef74eb40ebc884de8fc8e031969db Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 7 Jul 2017 16:30:50 +0100
Subject: [PATCH] Fix performance bar specs

---
 .../user_can_display_performance_bar_spec.rb      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/spec/features/user_can_display_performance_bar_spec.rb b/spec/features/user_can_display_performance_bar_spec.rb
index a3adb8c2882..9452fe6d92a 100644
--- a/spec/features/user_can_display_performance_bar_spec.rb
+++ b/spec/features/user_can_display_performance_bar_spec.rb
@@ -33,6 +33,8 @@ describe 'User can display performance bar', :js do
     end
   end
 
+  let(:group) { create(:group) }
+
   context 'when user is logged-out' do
     before do
       visit root_path
@@ -40,7 +42,7 @@ describe 'User can display performance bar', :js do
 
     context 'when the performance_bar feature is disabled' do
       before do
-        Feature.disable(:performance_bar)
+        stub_application_setting(performance_bar_allowed_group_id: nil)
       end
 
       it_behaves_like 'performance bar is disabled'
@@ -48,7 +50,7 @@ describe 'User can display performance bar', :js do
 
     context 'when the performance_bar feature is enabled' do
       before do
-        Feature.enable(:performance_bar)
+        stub_application_setting(performance_bar_allowed_group_id: group.id)
       end
 
       it_behaves_like 'performance bar is disabled'
@@ -57,14 +59,17 @@ describe 'User can display performance bar', :js do
 
   context 'when user is logged-in' do
     before do
-      gitlab_sign_in(create(:user))
+      user = create(:user)
+
+      gitlab_sign_in(user)
+      group.add_guest(user)
 
       visit root_path
     end
 
     context 'when the performance_bar feature is disabled' do
       before do
-        Feature.disable(:performance_bar)
+        stub_application_setting(performance_bar_allowed_group_id: nil)
       end
 
       it_behaves_like 'performance bar is disabled'
@@ -72,7 +77,7 @@ describe 'User can display performance bar', :js do
 
     context 'when the performance_bar feature is enabled' do
       before do
-        Feature.enable(:performance_bar)
+        stub_application_setting(performance_bar_allowed_group_id: group.id)
       end
 
       it_behaves_like 'performance bar is enabled'