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:
Diffstat (limited to 'spec')
-rw-r--r--spec/config/settings_spec.rb14
-rw-r--r--spec/frontend/vue_shared/security_reports/mock_data.js2
-rw-r--r--spec/lib/sidebars/admin/menus/admin_overview_menu_spec.rb3
-rw-r--r--spec/lib/sidebars/admin/menus/admin_settings_menu_spec.rb3
-rw-r--r--spec/models/user_preference_spec.rb17
-rw-r--r--spec/models/user_spec.rb4
-rw-r--r--spec/support/shared_examples/lib/sidebars/admin/menus/admin_menus_shared_examples.rb12
7 files changed, 47 insertions, 8 deletions
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index 4639e533922..60c460a036a 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -17,6 +17,20 @@ RSpec.describe Settings, feature_category: :system_access do
end
end
+ describe 'cron_jobs job_class can be resolved' do
+ it 'resolves all defined cron job worker classes' do
+ Settings.cron_jobs.each_value do |job_config|
+ next unless job_config
+
+ job_class = job_config['job_class']
+
+ next unless job_class
+
+ expect(job_class.safe_constantize).not_to eq(nil), "The defined job class (#{job_class}) in the cron job settings cannot be resolved."
+ end
+ end
+ end
+
describe '.build_ci_component_fqdn' do
subject(:fqdn) { described_class.build_ci_component_fqdn }
diff --git a/spec/frontend/vue_shared/security_reports/mock_data.js b/spec/frontend/vue_shared/security_reports/mock_data.js
index 533d312a4de..96900bc0ce8 100644
--- a/spec/frontend/vue_shared/security_reports/mock_data.js
+++ b/spec/frontend/vue_shared/security_reports/mock_data.js
@@ -53,7 +53,7 @@ export const mockFindings = [
},
remediations: [null],
solution: 'Upgrade to version 2.1.1 or above.',
- state: 'opened',
+ state: 'detected',
blob_path: '/gitlab-org/gitlab-ui/blob/ad137f0a8ac59af961afe47d04e5cc062c6864a9/yarn.lock',
evidence: 'Credit Card Detected: Diners Card',
},
diff --git a/spec/lib/sidebars/admin/menus/admin_overview_menu_spec.rb b/spec/lib/sidebars/admin/menus/admin_overview_menu_spec.rb
index d076e73fdd1..e27fbf4a7b5 100644
--- a/spec/lib/sidebars/admin/menus/admin_overview_menu_spec.rb
+++ b/spec/lib/sidebars/admin/menus/admin_overview_menu_spec.rb
@@ -9,4 +9,7 @@ RSpec.describe Sidebars::Admin::Menus::AdminOverviewMenu, feature_category: :nav
icon: 'overview'
it_behaves_like 'Admin menu with sub menus'
+
+ it_behaves_like 'Admin menu with extra container html options',
+ extra_container_html_options: { testid: 'admin-overview-submenu-content' }
end
diff --git a/spec/lib/sidebars/admin/menus/admin_settings_menu_spec.rb b/spec/lib/sidebars/admin/menus/admin_settings_menu_spec.rb
index 4c9f603e99f..9f211c19f68 100644
--- a/spec/lib/sidebars/admin/menus/admin_settings_menu_spec.rb
+++ b/spec/lib/sidebars/admin/menus/admin_settings_menu_spec.rb
@@ -10,4 +10,7 @@ RSpec.describe Sidebars::Admin::Menus::AdminSettingsMenu, feature_category: :nav
separated: true
it_behaves_like 'Admin menu with sub menus'
+
+ it_behaves_like 'Admin menu with extra container html options',
+ extra_container_html_options: { testid: 'admin-settings-menu-link' }
end
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index ee3fbb97e47..46559077339 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -8,6 +8,16 @@ RSpec.describe UserPreference, feature_category: :user_profile do
let(:user_preference) { create(:user_preference, user: user) }
describe 'validations' do
+ it { is_expected.to validate_inclusion_of(:time_display_relative).in_array([true, false]) }
+ it { is_expected.to validate_inclusion_of(:render_whitespace_in_code).in_array([true, false]) }
+
+ it do
+ is_expected.to validate_numericality_of(:tab_width)
+ .only_integer
+ .is_greater_than_or_equal_to(Gitlab::TabWidth::MIN)
+ .is_less_than_or_equal_to(Gitlab::TabWidth::MAX)
+ end
+
describe 'diffs_deletion_color and diffs_addition_color' do
using RSpec::Parameterized::TableSyntax
@@ -163,13 +173,6 @@ RSpec.describe UserPreference, feature_category: :user_profile do
expect(pref.reload.tab_width).to eq(8)
end
-
- it do
- is_expected.to validate_numericality_of(:tab_width)
- .only_integer
- .is_greater_than_or_equal_to(1)
- .is_less_than_or_equal_to(12)
- end
end
describe '#tab_width=' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c40c43db727..670256c7e65 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -728,6 +728,10 @@ RSpec.describe User, feature_category: :user_profile do
end
it { is_expected.to validate_presence_of(:projects_limit) }
+ it { is_expected.to define_enum_for(:project_view).with_values(%i[readme activity files wiki]) }
+ it { is_expected.to validate_inclusion_of(:hide_no_ssh_key).in_array([true, false]) }
+ it { is_expected.to validate_inclusion_of(:hide_no_password).in_array([true, false]) }
+ it { is_expected.to validate_inclusion_of(:notified_of_own_activity).in_array([true, false]) }
it { is_expected.to validate_numericality_of(:projects_limit) }
it { is_expected.to allow_value(0).for(:projects_limit) }
it { is_expected.not_to allow_value(-1).for(:projects_limit) }
diff --git a/spec/support/shared_examples/lib/sidebars/admin/menus/admin_menus_shared_examples.rb b/spec/support/shared_examples/lib/sidebars/admin/menus/admin_menus_shared_examples.rb
index f913c6b8a9e..4168d867535 100644
--- a/spec/support/shared_examples/lib/sidebars/admin/menus/admin_menus_shared_examples.rb
+++ b/spec/support/shared_examples/lib/sidebars/admin/menus/admin_menus_shared_examples.rb
@@ -76,3 +76,15 @@ RSpec.shared_examples 'Admin menu with sub menus' do
expect(subject.has_items?).to be true
end
end
+
+RSpec.shared_examples 'Admin menu with extra container html options' do |extra_container_html_options:|
+ let_it_be(:user) { build(:user, :admin) }
+
+ let(:context) { Sidebars::Context.new(current_user: user, container: nil) }
+
+ subject { described_class.new(context) }
+
+ it 'contains extra container html options' do
+ expect(subject.extra_container_html_options).to eq extra_container_html_options
+ end
+end