diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/instance_statistics/cohorts_controller_spec.rb | 7 | ||||
| -rw-r--r-- | spec/controllers/instance_statistics/conversational_development_index_controller_spec.rb | 7 | ||||
| -rw-r--r-- | spec/features/admin/admin_cohorts_spec.rb (renamed from spec/features/instance_statistics/cohorts_spec.rb) | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_conversational_development_index_spec.rb (renamed from spec/features/instance_statistics/conversational_development_index_spec.rb) | 8 | ||||
| -rw-r--r-- | spec/features/dashboard/active_tab_spec.rb | 28 | ||||
| -rw-r--r-- | spec/features/dashboard/instance_statistics_spec.rb | 60 | ||||
| -rw-r--r-- | spec/policies/global_policy_spec.rb | 34 | ||||
| -rw-r--r-- | spec/requests/api/settings_spec.rb | 5 | ||||
| -rw-r--r-- | spec/routing/instance_statistics_routing_spec.rb | 11 | ||||
| -rw-r--r-- | spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb | 37 |
10 files changed, 18 insertions, 183 deletions
diff --git a/spec/controllers/instance_statistics/cohorts_controller_spec.rb b/spec/controllers/instance_statistics/cohorts_controller_spec.rb deleted file mode 100644 index e4eedede93a..00000000000 --- a/spec/controllers/instance_statistics/cohorts_controller_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe InstanceStatistics::CohortsController do - it_behaves_like 'instance statistics availability' -end diff --git a/spec/controllers/instance_statistics/conversational_development_index_controller_spec.rb b/spec/controllers/instance_statistics/conversational_development_index_controller_spec.rb deleted file mode 100644 index 4935cb265bf..00000000000 --- a/spec/controllers/instance_statistics/conversational_development_index_controller_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe InstanceStatistics::ConversationalDevelopmentIndexController do - it_behaves_like 'instance statistics availability' -end diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/admin/admin_cohorts_spec.rb index 81fc5eff980..9dce9494b97 100644 --- a/spec/features/instance_statistics/cohorts_spec.rb +++ b/spec/features/admin/admin_cohorts_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe 'Cohorts page' do +describe 'Admin cohorts page' do before do sign_in(create(:admin)) end @@ -8,7 +8,7 @@ describe 'Cohorts page' do it 'See users count per month' do 2.times { create(:user) } - visit instance_statistics_cohorts_path + visit admin_cohorts_path expect(page).to have_content("#{Time.now.strftime('%b %Y')} 3 0") end diff --git a/spec/features/instance_statistics/conversational_development_index_spec.rb b/spec/features/admin/admin_conversational_development_index_spec.rb index d441a7a5af9..2d2c7df5364 100644 --- a/spec/features/instance_statistics/conversational_development_index_spec.rb +++ b/spec/features/admin/admin_conversational_development_index_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Conversational Development Index' do +describe 'Admin Conversational Development Index' do before do sign_in(create(:admin)) end @@ -9,7 +9,7 @@ describe 'Conversational Development Index' do it 'shows empty state' do stub_application_setting(usage_ping_enabled: false) - visit instance_statistics_conversational_development_index_index_path + visit admin_conversational_development_index_path expect(page).to have_content('Usage ping is not enabled') end @@ -19,7 +19,7 @@ describe 'Conversational Development Index' do it 'shows empty state' do stub_application_setting(usage_ping_enabled: true) - visit instance_statistics_conversational_development_index_index_path + visit admin_conversational_development_index_path expect(page).to have_content('Data is still calculating') end @@ -30,7 +30,7 @@ describe 'Conversational Development Index' do stub_application_setting(usage_ping_enabled: true) create(:conversational_development_index_metric) - visit instance_statistics_conversational_development_index_index_path + visit admin_conversational_development_index_path expect(page).to have_content( 'Issues created per active user 1.2 You 9.3 Lead 13.3%' diff --git a/spec/features/dashboard/active_tab_spec.rb b/spec/features/dashboard/active_tab_spec.rb index f4d0f82d248..8bab501134b 100644 --- a/spec/features/dashboard/active_tab_spec.rb +++ b/spec/features/dashboard/active_tab_spec.rb @@ -7,38 +7,32 @@ RSpec.describe 'Dashboard Active Tab', :js do shared_examples 'page has active tab' do |title| it "#{title} tab" do - subject - expect(page).to have_selector('.navbar-sub-nav li.active', count: 1) expect(find('.navbar-sub-nav li.active')).to have_content(title) end end context 'on dashboard projects' do - it_behaves_like 'page has active tab', 'Projects' do - subject { visit dashboard_projects_path } + before do + visit dashboard_projects_path end + + it_behaves_like 'page has active tab', 'Projects' end context 'on dashboard groups' do - it_behaves_like 'page has active tab', 'Groups' do - subject { visit dashboard_groups_path } + before do + visit dashboard_groups_path end + + it_behaves_like 'page has active tab', 'Groups' end context 'on activity projects' do - it_behaves_like 'page has active tab', 'Activity' do - subject { visit activity_dashboard_path } + before do + visit activity_dashboard_path end - end - context 'on instance statistics' do - subject { visit instance_statistics_root_path } - - it 'shows Instance Statistics` as active' do - subject - - expect(find('.navbar-sub-nav li.active')).to have_link('Instance Statistics') - end + it_behaves_like 'page has active tab', 'Activity' end end diff --git a/spec/features/dashboard/instance_statistics_spec.rb b/spec/features/dashboard/instance_statistics_spec.rb deleted file mode 100644 index 21ee2796bd8..00000000000 --- a/spec/features/dashboard/instance_statistics_spec.rb +++ /dev/null @@ -1,60 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'Showing instance statistics' do - before do - sign_in user if user - end - - # Using a path that is publicly accessible - subject { visit explore_projects_path } - - context 'for unauthenticated users' do - let(:user) { nil } - - it 'does not show the instance statistics link' do - subject - - expect(page).not_to have_link('Instance Statistics') - end - end - - context 'for regular users' do - let(:user) { create(:user) } - - context 'when instance statistics are publicly available' do - before do - stub_application_setting(instance_statistics_visibility_private: false) - end - - it 'shows the instance statistics link' do - subject - - expect(page).to have_link('Instance Statistics') - end - end - - context 'when instance statistics are not publicly available' do - before do - stub_application_setting(instance_statistics_visibility_private: true) - end - - it 'shows the instance statistics link' do - subject - - expect(page).not_to have_link('Instance Statistics') - end - end - end - - context 'for admins' do - let(:user) { create(:admin) } - - it 'shows the instance statistics link' do - subject - - expect(page).to have_link('Instance Statistics') - end - end -end diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb index 30d68e7dc9d..a2047b54deb 100644 --- a/spec/policies/global_policy_spec.rb +++ b/spec/policies/global_policy_spec.rb @@ -180,38 +180,4 @@ describe GlobalPolicy do end end end - - describe 'read instance statistics' do - context 'regular user' do - it { is_expected.to be_allowed(:read_instance_statistics) } - - context 'when instance statistics are set to private' do - before do - stub_application_setting(instance_statistics_visibility_private: true) - end - - it { is_expected.not_to be_allowed(:read_instance_statistics) } - end - end - - context 'admin' do - let(:current_user) { create(:admin) } - - it { is_expected.to be_allowed(:read_instance_statistics) } - - context 'when instance statistics are set to private' do - before do - stub_application_setting(instance_statistics_visibility_private: true) - end - - it { is_expected.to be_allowed(:read_instance_statistics) } - end - end - - context 'anonymous' do - let(:current_user) { nil } - - it { is_expected.not_to be_allowed(:read_instance_statistics) } - end - end end diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb index 3e0f47b84a1..57adc3ca7a6 100644 --- a/spec/requests/api/settings_spec.rb +++ b/spec/requests/api/settings_spec.rb @@ -25,7 +25,6 @@ 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).not_to have_key('performance_bar_allowed_group_path') expect(json_response).not_to have_key('performance_bar_enabled') end @@ -65,8 +64,7 @@ describe API::Settings, 'Settings' do circuitbreaker_check_interval: 2, enforce_terms: true, terms: 'Hello world!', - performance_bar_allowed_group_path: group.full_path, - instance_statistics_visibility_private: true + performance_bar_allowed_group_path: group.full_path expect(response).to have_gitlab_http_status(200) expect(json_response['default_projects_limit']).to eq(3) @@ -91,7 +89,6 @@ describe API::Settings, 'Settings' do expect(json_response['enforce_terms']).to be(true) expect(json_response['terms']).to eq('Hello world!') expect(json_response['performance_bar_allowed_group_id']).to eq(group.id) - expect(json_response['instance_statistics_visibility_private']).to be(true) end end diff --git a/spec/routing/instance_statistics_routing_spec.rb b/spec/routing/instance_statistics_routing_spec.rb deleted file mode 100644 index b94faabfa1d..00000000000 --- a/spec/routing/instance_statistics_routing_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'Instance Statistics', 'routing' do - include RSpec::Rails::RequestExampleGroup - - it "routes '/-/instance_statistics' to conversational development index" do - expect(get('/-/instance_statistics')).to redirect_to('/-/instance_statistics/conversational_development_index') - end -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 deleted file mode 100644 index 5334af841e1..00000000000 --- a/spec/support/shared_examples/instance_statistics_controllers_shared_examples.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -shared_examples 'instance statistics availability' do - let(:user) { create(:user) } - - before do - sign_in(user) - end - - describe 'GET #index' do - it 'is available when the feature is available publicly' do - get :index - - expect(response).to have_gitlab_http_status(:success) - end - - it 'renders a 404 when the feature is not available publicly' do - stub_application_setting(instance_statistics_visibility_private: true) - - get :index - - expect(response).to have_gitlab_http_status(:not_found) - end - - context 'for admins' do - let(:user) { create(:admin) } - - it 'allows access when the feature is not available publicly' do - stub_application_setting(instance_statistics_visibility_private: true) - - get :index - - expect(response).to have_gitlab_http_status(:success) - end - end - end -end |