diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 03:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 03:08:01 +0300 |
commit | 5e396cd53ef1686fbc02b446a6a44d8a69ce8755 (patch) | |
tree | 81f60b948fa91d230b3494a549c81a1a2e8b7d7e /spec/features | |
parent | 61a1cd3b8389a7f5553bae90655710ed9b39ddff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/admin_variables_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/group_variables_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/populate_new_pipeline_vars_with_params_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/profiles/user_edit_profile_spec.rb | 20 | ||||
-rw-r--r-- | spec/features/project_group_variables_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/project_variables_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/ci/editor_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/ci/lint_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/integrations/user_activates_slack_notifications_spec.rb | 1 |
9 files changed, 27 insertions, 8 deletions
diff --git a/spec/features/admin_variables_spec.rb b/spec/features/admin_variables_spec.rb index d1adbf59984..0c9c4d19791 100644 --- a/spec/features/admin_variables_spec.rb +++ b/spec/features/admin_variables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Instance variables', :js, feature_category: :pipeline_authoring do +RSpec.describe 'Instance variables', :js, feature_category: :pipeline_composition do let(:admin) { create(:admin) } let(:page_path) { ci_cd_admin_application_settings_path } diff --git a/spec/features/group_variables_spec.rb b/spec/features/group_variables_spec.rb index 117f50aefc6..d34accee0b8 100644 --- a/spec/features/group_variables_spec.rb +++ b/spec/features/group_variables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group variables', :js, feature_category: :pipeline_authoring do +RSpec.describe 'Group variables', :js, feature_category: :pipeline_composition do let(:user) { create(:user) } let(:group) { create(:group) } let!(:variable) { create(:ci_group_variable, key: 'test_key', value: 'test_value', masked: true, group: group) } diff --git a/spec/features/populate_new_pipeline_vars_with_params_spec.rb b/spec/features/populate_new_pipeline_vars_with_params_spec.rb index a83b5a81a41..b3ba0a874e9 100644 --- a/spec/features/populate_new_pipeline_vars_with_params_spec.rb +++ b/spec/features/populate_new_pipeline_vars_with_params_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Populate new pipeline CI variables with url params", :js, feature_category: :pipeline_authoring do +RSpec.describe "Populate new pipeline CI variables with url params", :js, feature_category: :pipeline_composition do let(:user) { create(:user) } let(:project) { create(:project) } let(:page_path) { new_project_pipeline_path(project) } diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb index 3819723cc09..196134a0bda 100644 --- a/spec/features/profiles/user_edit_profile_spec.rb +++ b/spec/features/profiles/user_edit_profile_spec.rb @@ -97,6 +97,26 @@ RSpec.describe 'User edit profile', feature_category: :user_profile do expect(page).to have_content('Website url is not a valid URL') end + it 'validates that the dicord id has a valid length', :js do + valid_dicord_id = '123456789123456789' + too_short_discord_id = '123456' + too_long_discord_id = '123456789abcdefghijkl' + + fill_in 'user_discord', with: too_short_discord_id + expect(page).to have_content('Discord ID is too short') + + fill_in 'user_discord', with: too_long_discord_id + expect(page).to have_content('Discord ID is too long') + + fill_in 'user_discord', with: valid_dicord_id + + submit_settings + + expect(user.reload).to have_attributes( + discord: valid_dicord_id + ) + end + describe 'when I change my email', :js do before do user.send_reset_password_instructions diff --git a/spec/features/project_group_variables_spec.rb b/spec/features/project_group_variables_spec.rb index 0e1e6e49c6d..8d600edadde 100644 --- a/spec/features/project_group_variables_spec.rb +++ b/spec/features/project_group_variables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project group variables', :js, feature_category: :pipeline_authoring do +RSpec.describe 'Project group variables', :js, feature_category: :pipeline_composition do let(:user) { create(:user) } let(:group) { create(:group) } let(:subgroup) { create(:group, parent: group) } diff --git a/spec/features/project_variables_spec.rb b/spec/features/project_variables_spec.rb index 1a951980141..ae506a4bad7 100644 --- a/spec/features/project_variables_spec.rb +++ b/spec/features/project_variables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project variables', :js, feature_category: :pipeline_authoring do +RSpec.describe 'Project variables', :js, feature_category: :pipeline_composition do let(:user) { create(:user) } let(:project) { create(:project) } let(:variable) { create(:ci_variable, key: 'test_key', value: 'test_value', masked: true) } diff --git a/spec/features/projects/ci/editor_spec.rb b/spec/features/projects/ci/editor_spec.rb index 536152626af..ed03491d69a 100644 --- a/spec/features/projects/ci/editor_spec.rb +++ b/spec/features/projects/ci/editor_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Pipeline Editor', :js, feature_category: :pipeline_authoring do +RSpec.describe 'Pipeline Editor', :js, feature_category: :pipeline_composition do include Spec::Support::Helpers::Features::SourceEditorSpecHelpers let(:project) { create(:project_empty_repo, :public) } diff --git a/spec/features/projects/ci/lint_spec.rb b/spec/features/projects/ci/lint_spec.rb index 4fea07b18bc..aa9556761c6 100644 --- a/spec/features/projects/ci/lint_spec.rb +++ b/spec/features/projects/ci/lint_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'CI Lint', :js, feature_category: :pipeline_authoring do +RSpec.describe 'CI Lint', :js, feature_category: :pipeline_composition do include Spec::Support::Helpers::Features::SourceEditorSpecHelpers let_it_be(:project) { create(:project, :repository) } diff --git a/spec/features/projects/integrations/user_activates_slack_notifications_spec.rb b/spec/features/projects/integrations/user_activates_slack_notifications_spec.rb index ec00dcaf046..01c202baf70 100644 --- a/spec/features/projects/integrations/user_activates_slack_notifications_spec.rb +++ b/spec/features/projects/integrations/user_activates_slack_notifications_spec.rb @@ -7,7 +7,6 @@ RSpec.describe 'User activates Slack notifications', :js, feature_category: :int context 'when integration is not configured yet' do before do - stub_feature_flags(integration_slack_app_notifications: false) visit_project_integration('Slack notifications') end |