Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-08-06 12:52:10 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2018-08-06 14:33:07 +0300
commitbaffe82ace1ca3ee247c1eee2a5c21aea2256539 (patch)
treef8463f91103e7c8ac7809924c8978cf866b374dd /spec
parent0f871450cd3e77b0a94769a12d2d100a6d093e2c (diff)
Hide instance statistics on new installations
Making the migrations and the default do the right thing in the first place. This makes 20180806094307 a no-op.
Diffstat (limited to 'spec')
-rw-r--r--spec/features/dashboard/active_tab_spec.rb4
-rw-r--r--spec/policies/global_policy_spec.rb16
-rw-r--r--spec/requests/api/settings_spec.rb2
-rw-r--r--spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb2
4 files changed, 21 insertions, 3 deletions
diff --git a/spec/features/dashboard/active_tab_spec.rb b/spec/features/dashboard/active_tab_spec.rb
index f4d0f82d248..a7d86bd4560 100644
--- a/spec/features/dashboard/active_tab_spec.rb
+++ b/spec/features/dashboard/active_tab_spec.rb
@@ -35,6 +35,10 @@ RSpec.describe 'Dashboard Active Tab', :js do
context 'on instance statistics' do
subject { visit instance_statistics_root_path }
+ before do
+ stub_application_setting(instance_statistics_visibility_private: false)
+ end
+
it 'shows Instance Statistics` as active' do
subject
diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb
index 30d68e7dc9d..35f1912c1c8 100644
--- a/spec/policies/global_policy_spec.rb
+++ b/spec/policies/global_policy_spec.rb
@@ -183,7 +183,13 @@ describe GlobalPolicy do
describe 'read instance statistics' do
context 'regular user' do
- it { is_expected.to be_allowed(:read_instance_statistics) }
+ context 'when instance statistics are publicly available' do
+ before do
+ stub_application_setting(instance_statistics_visibility_private: false)
+ end
+
+ it { is_expected.to be_allowed(:read_instance_statistics) }
+ end
context 'when instance statistics are set to private' do
before do
@@ -197,7 +203,13 @@ describe GlobalPolicy do
context 'admin' do
let(:current_user) { create(:admin) }
- it { is_expected.to be_allowed(:read_instance_statistics) }
+ context 'when instance statistics are publicly available' do
+ before do
+ stub_application_setting(instance_statistics_visibility_private: false)
+ end
+
+ it { is_expected.to be_allowed(:read_instance_statistics) }
+ end
context 'when instance statistics are set to private' do
before do
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 3e0f47b84a1..9a662c21354 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -25,7 +25,7 @@ describe API::Settings, 'Settings' do
expect(json_response['ed25519_key_restriction']).to eq(0)
expect(json_response['circuitbreaker_failure_count_threshold']).not_to be_nil
expect(json_response['performance_bar_allowed_group_id']).to be_nil
- expect(json_response['instance_statistics_visibility_private']).to be(false)
+ expect(json_response['instance_statistics_visibility_private']).to be(true)
expect(json_response).not_to have_key('performance_bar_allowed_group_path')
expect(json_response).not_to have_key('performance_bar_enabled')
end
diff --git a/spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb b/spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb
index 5334af841e1..9f0604b5f8e 100644
--- a/spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb
+++ b/spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb
@@ -9,6 +9,8 @@ shared_examples 'instance statistics availability' do
describe 'GET #index' do
it 'is available when the feature is available publicly' do
+ stub_application_setting(instance_statistics_visibility_private: false)
+
get :index
expect(response).to have_gitlab_http_status(:success)