diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 18:08:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-05 18:08:04 +0300 |
commit | 63414b32fd0e75477285df4603e9f7b31dffa955 (patch) | |
tree | fe6cb1ad5b1c8c4ddb4dc7300aa9f046b1c93fc2 /spec/features | |
parent | 12b995e0e7aace4b7695c4424aed71b053c2c2a6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
26 files changed, 35 insertions, 34 deletions
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb index 94c26bcc8a6..e6630e40147 100644 --- a/spec/features/admin/admin_hooks_spec.rb +++ b/spec/features/admin/admin_hooks_spec.rb @@ -58,10 +58,7 @@ RSpec.describe 'Admin::Hooks', feature_category: :integrations do describe 'Update existing hook' do let(:new_url) { generate(:url) } - - before do - create(:system_hook) - end + let_it_be(:hook) { create(:system_hook) } it 'updates existing hook' do visit admin_hooks_path @@ -71,9 +68,9 @@ RSpec.describe 'Admin::Hooks', feature_category: :integrations do check 'Enable SSL verification' click_button 'Save changes' - expect(page).to have_content 'SSL Verification: enabled' - expect(page).to have_current_path(admin_hooks_path, ignore_query: true) - expect(page).to have_content(new_url) + expect(page).to have_content('Enable SSL verification') + expect(page).to have_current_path(edit_admin_hook_path(hook), ignore_query: true) + expect(page).to have_content('Recent events') end end diff --git a/spec/features/discussion_comments/commit_spec.rb b/spec/features/discussion_comments/commit_spec.rb index 261e9fb9f3b..5407542dfc6 100644 --- a/spec/features/discussion_comments/commit_spec.rb +++ b/spec/features/discussion_comments/commit_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Thread Comments Commit', :js do +RSpec.describe 'Thread Comments Commit', :js, feature_category: :source_code_management do include RepoHelpers let(:user) { create(:user) } diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb index ebb57b37918..90be3f0760d 100644 --- a/spec/features/discussion_comments/issue_spec.rb +++ b/spec/features/discussion_comments/issue_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Thread Comments Issue', :js do +RSpec.describe 'Thread Comments Issue', :js, feature_category: :source_code_management do let(:user) { create(:user) } let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb index a90ff3721d3..64395a44e57 100644 --- a/spec/features/discussion_comments/merge_request_spec.rb +++ b/spec/features/discussion_comments/merge_request_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Thread Comments Merge Request', :js do +RSpec.describe 'Thread Comments Merge Request', :js, feature_category: :source_code_management do let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:merge_request) { create(:merge_request, source_project: project) } diff --git a/spec/features/discussion_comments/snippets_spec.rb b/spec/features/discussion_comments/snippets_spec.rb index ca0a6d6e1c5..a703c880737 100644 --- a/spec/features/discussion_comments/snippets_spec.rb +++ b/spec/features/discussion_comments/snippets_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Thread Comments Snippet', :js do +RSpec.describe 'Thread Comments Snippet', :js, feature_category: :source_code_management do let_it_be(:user) { create(:user) } before do diff --git a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb index 2ac43f67f64..168c4f330ca 100644 --- a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb +++ b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'When a user filters Sentry errors by status', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do +RSpec.describe 'When a user filters Sentry errors by status', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline, +feature_category: :error_tracking do include_context 'sentry error tracking context feature' let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') } diff --git a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb index 40718deed75..6026b42f7de 100644 --- a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb +++ b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'When a user searches for Sentry errors', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do +RSpec.describe 'When a user searches for Sentry errors', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline, +feature_category: :error_tracking do include_context 'sentry error tracking context feature' let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') } diff --git a/spec/features/error_tracking/user_sees_error_details_spec.rb b/spec/features/error_tracking/user_sees_error_details_spec.rb index ecbb3fe0412..d7676d90d21 100644 --- a/spec/features/error_tracking/user_sees_error_details_spec.rb +++ b/spec/features/error_tracking/user_sees_error_details_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'View error details page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do +RSpec.describe 'View error details page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline, +feature_category: :error_tracking do include_context 'sentry error tracking context feature' context 'with current user as project owner' do diff --git a/spec/features/error_tracking/user_sees_error_index_spec.rb b/spec/features/error_tracking/user_sees_error_index_spec.rb index 21f9e688e3f..b7dfb6afc18 100644 --- a/spec/features/error_tracking/user_sees_error_index_spec.rb +++ b/spec/features/error_tracking/user_sees_error_index_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe 'View error index page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do +RSpec.describe 'View error index page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline, +feature_category: :error_tracking do include_context 'sentry error tracking context feature' let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') } diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb index ba09cc20154..3ffa0dc5b64 100644 --- a/spec/features/explore/groups_list_spec.rb +++ b/spec/features/explore/groups_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Explore Groups page', :js do +RSpec.describe 'Explore Groups page', :js, feature_category: :subgroups do let!(:user) { create :user } let!(:group) { create(:group) } let!(:public_group) { create(:group, :public) } diff --git a/spec/features/explore/groups_spec.rb b/spec/features/explore/groups_spec.rb index 201dc24b359..458f83dffb4 100644 --- a/spec/features/explore/groups_spec.rb +++ b/spec/features/explore/groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Explore Groups', :js do +RSpec.describe 'Explore Groups', :js, feature_category: :subgroups do let(:user) { create :user } let(:group) { create :group } let!(:private_project) do diff --git a/spec/features/explore/topics_spec.rb b/spec/features/explore/topics_spec.rb index f0c57c2417a..b5787a2dba8 100644 --- a/spec/features/explore/topics_spec.rb +++ b/spec/features/explore/topics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Explore Topics' do +RSpec.describe 'Explore Topics', feature_category: :users do context 'when no topics exist' do it 'renders empty message', :aggregate_failures do visit topics_explore_projects_path diff --git a/spec/features/explore/user_explores_projects_spec.rb b/spec/features/explore/user_explores_projects_spec.rb index c082ff1fb0c..31dafca6206 100644 --- a/spec/features/explore/user_explores_projects_spec.rb +++ b/spec/features/explore/user_explores_projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User explores projects' do +RSpec.describe 'User explores projects', feature_category: :users do context 'when some projects exist' do let_it_be(:archived_project) { create(:project, :archived) } let_it_be(:internal_project) { create(:project, :internal) } diff --git a/spec/features/issue_rebalancing_spec.rb b/spec/features/issue_rebalancing_spec.rb index 4fa29361c54..3b14924b90e 100644 --- a/spec/features/issue_rebalancing_spec.rb +++ b/spec/features/issue_rebalancing_spec.rb @@ -41,13 +41,13 @@ RSpec.describe 'Issue rebalancing' do it 'shows an alert in project issues list with manual sort', :js do visit project_issues_path(project, sort: 'relative_position') - expect(page).to have_selector('.gl-alert-danger', text: alert_message_regex, count: 1) + expect(page).to have_selector('.gl-alert-info', text: alert_message_regex, count: 1) end it 'shows an alert in group issues list with manual sort', :js do visit issues_group_path(group, sort: 'relative_position') - expect(page).to have_selector('.gl-alert-danger', text: alert_message_regex, count: 1) + expect(page).to have_selector('.gl-alert-info', text: alert_message_regex, count: 1) end it 'does not show an alert in project issues list with other sorts' do diff --git a/spec/features/jira_connect/branches_spec.rb b/spec/features/jira_connect/branches_spec.rb index c334a425849..bee31949dd4 100644 --- a/spec/features/jira_connect/branches_spec.rb +++ b/spec/features/jira_connect/branches_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Create GitLab branches from Jira', :js do +RSpec.describe 'Create GitLab branches from Jira', :js, feature_category: :integrations do let_it_be(:alice) { create(:user, name: 'Alice') } let_it_be(:bob) { create(:user, name: 'Bob') } diff --git a/spec/features/jira_connect/subscriptions_spec.rb b/spec/features/jira_connect/subscriptions_spec.rb index 0468cfd70fc..8686234df01 100644 --- a/spec/features/jira_connect/subscriptions_spec.rb +++ b/spec/features/jira_connect/subscriptions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Subscriptions Content Security Policy' do +RSpec.describe 'Subscriptions Content Security Policy', feature_category: :integrations do include ContentSecurityPolicyHelpers let(:installation) { create(:jira_connect_installation) } diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb index b5bf9279371..928ee16cd60 100644 --- a/spec/features/markdown/copy_as_gfm_spec.rb +++ b/spec/features/markdown/copy_as_gfm_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Copy as GFM', :js do +RSpec.describe 'Copy as GFM', :js, feature_category: :team_planning do include MarkupHelper include RepoHelpers include ActionView::Helpers::JavaScriptHelper diff --git a/spec/features/markdown/gitlab_flavored_markdown_spec.rb b/spec/features/markdown/gitlab_flavored_markdown_spec.rb index 17fe2dab8f7..36b02b17924 100644 --- a/spec/features/markdown/gitlab_flavored_markdown_spec.rb +++ b/spec/features/markdown/gitlab_flavored_markdown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "GitLab Flavored Markdown" do +RSpec.describe "GitLab Flavored Markdown", feature_category: :team_planning do let(:user) { create(:user) } let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } diff --git a/spec/features/markdown/json_table_spec.rb b/spec/features/markdown/json_table_spec.rb index 6b74dbac255..a9afbe1fc57 100644 --- a/spec/features/markdown/json_table_spec.rb +++ b/spec/features/markdown/json_table_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Rendering json:table code block in markdown', :js do +RSpec.describe 'Rendering json:table code block in markdown', :js, feature_category: :team_planning do let_it_be(:project) { create(:project, :public) } it 'creates table correctly' do diff --git a/spec/features/markdown/keyboard_shortcuts_spec.rb b/spec/features/markdown/keyboard_shortcuts_spec.rb index 82288af1f9f..cfb8e61689f 100644 --- a/spec/features/markdown/keyboard_shortcuts_spec.rb +++ b/spec/features/markdown/keyboard_shortcuts_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Markdown keyboard shortcuts', :js do +RSpec.describe 'Markdown keyboard shortcuts', :js, feature_category: :team_planning do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } diff --git a/spec/features/markdown/kroki_spec.rb b/spec/features/markdown/kroki_spec.rb index f02f5d44244..dca00c5f2fa 100644 --- a/spec/features/markdown/kroki_spec.rb +++ b/spec/features/markdown/kroki_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'kroki rendering', :js do +RSpec.describe 'kroki rendering', :js, feature_category: :team_planning do let_it_be(:project) { create(:project, :public) } before do diff --git a/spec/features/markdown/markdown_spec.rb b/spec/features/markdown/markdown_spec.rb index 73670772402..132a03877f8 100644 --- a/spec/features/markdown/markdown_spec.rb +++ b/spec/features/markdown/markdown_spec.rb @@ -26,7 +26,7 @@ require 'erb' # # See the MarkdownFeature class for setup details. -RSpec.describe 'GitLab Markdown', :aggregate_failures do +RSpec.describe 'GitLab Markdown', :aggregate_failures, feature_category: :team_planning do include Capybara::Node::Matchers include MarkupHelper include MarkdownMatchers diff --git a/spec/features/markdown/math_spec.rb b/spec/features/markdown/math_spec.rb index 1f219886818..0c77bd2a8ff 100644 --- a/spec/features/markdown/math_spec.rb +++ b/spec/features/markdown/math_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Math rendering', :js do +RSpec.describe 'Math rendering', :js, feature_category: :team_planning do let!(:project) { create(:project, :public) } it 'renders inline and display math correctly' do diff --git a/spec/features/markdown/metrics_spec.rb b/spec/features/markdown/metrics_spec.rb index 61dd41204f8..b5e42b16f87 100644 --- a/spec/features/markdown/metrics_spec.rb +++ b/spec/features/markdown/metrics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Metrics rendering', :js, :kubeclient, :use_clean_rails_memory_store_caching, :sidekiq_inline do +RSpec.describe 'Metrics rendering', :js, :kubeclient, :use_clean_rails_memory_store_caching, :sidekiq_inline, feature_category: :team_planning do include PrometheusHelpers include KubernetesHelpers include GrafanaApiHelpers diff --git a/spec/features/markdown/sandboxed_mermaid_spec.rb b/spec/features/markdown/sandboxed_mermaid_spec.rb index 2bf88d7882d..26b397a1fd5 100644 --- a/spec/features/markdown/sandboxed_mermaid_spec.rb +++ b/spec/features/markdown/sandboxed_mermaid_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Sandboxed Mermaid rendering', :js do +RSpec.describe 'Sandboxed Mermaid rendering', :js, feature_category: :team_planning do let_it_be(:project) { create(:project, :public, :repository) } let_it_be(:description) do <<~MERMAID diff --git a/spec/features/projects/settings/webhooks_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb index b6a197e368f..8d22d84b9c9 100644 --- a/spec/features/projects/settings/webhooks_settings_spec.rb +++ b/spec/features/projects/settings/webhooks_settings_spec.rb @@ -74,8 +74,8 @@ RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :proj check 'Enable SSL verification' click_button 'Save changes' - expect(page).to have_content 'SSL Verification: enabled' - expect(page).to have_content(url) + expect(page).to have_content('Enable SSL verification') + expect(page).to have_current_path(edit_project_hook_path(project, hook), ignore_query: true) end it 'test existing webhook', :js do |