diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-09 21:09:32 +0300 |
commit | 1268cfeaf73a73c5593f13639530513716826e2b (patch) | |
tree | 2508ffb2fddaa666d99b4e5984d3340eb9194782 /spec/support | |
parent | be769d5fcced48143e92f83c997b7d5ba14873e1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
3 files changed, 20 insertions, 2 deletions
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml index 888aaffa8cc..96cdf5adec8 100644 --- a/spec/support/rspec_order_todo.yml +++ b/spec/support/rspec_order_todo.yml @@ -445,7 +445,6 @@ - './ee/spec/features/projects/settings/pipeline_subscriptions_spec.rb' - './ee/spec/features/projects/settings/protected_environments_spec.rb' - './ee/spec/features/projects/settings/push_rules_settings_spec.rb' -- './ee/spec/features/projects/settings/slack_application_spec.rb' - './ee/spec/features/projects/settings/user_manages_approval_settings_spec.rb' - './ee/spec/features/projects/settings/user_manages_issues_template_spec.rb' - './ee/spec/features/projects/settings/user_manages_members_spec.rb' @@ -2210,7 +2209,6 @@ - './ee/spec/requests/api/group_repository_storage_moves_spec.rb' - './ee/spec/requests/api/groups_spec.rb' - './ee/spec/requests/api/group_variables_spec.rb' -- './ee/spec/requests/api/integrations_spec.rb' - './ee/spec/requests/api/internal/app_sec/dast/site_validations_spec.rb' - './ee/spec/requests/api/internal/base_spec.rb' - './ee/spec/requests/api/internal/kubernetes_spec.rb' diff --git a/spec/support/shared_examples/features/content_editor_shared_examples.rb b/spec/support/shared_examples/features/content_editor_shared_examples.rb index c37b6ecf929..f70288168d7 100644 --- a/spec/support/shared_examples/features/content_editor_shared_examples.rb +++ b/spec/support/shared_examples/features/content_editor_shared_examples.rb @@ -413,6 +413,21 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi end end + describe 'rendering with initial content' do + it 'renders correctly with table as initial content' do + textarea = find 'textarea' + textarea.send_keys "\n\n" + textarea.send_keys "| First Header | Second Header |\n" + textarea.send_keys "|--------------|---------------|\n" + textarea.send_keys "| Content from cell 1 | Content from cell 2 |\n\n" + textarea.send_keys "Content below table" + + switch_to_content_editor + + expect(page).not_to have_text('An error occurred') + end + end + describe 'pasting text' do before do switch_to_content_editor diff --git a/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb b/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb index 4a33ace340b..64f811771ec 100644 --- a/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb +++ b/spec/support/shared_examples/graphql/notes_on_noteables_shared_examples.rb @@ -51,6 +51,8 @@ RSpec.shared_context 'exposing regular notes on a noteable in GraphQL' do it 'avoids N+1 queries' do create(:award_emoji, awardable: note, name: 'star', user: user) + another_user = create(:user).tap { |u| note.resource_parent.add_developer(u) } + create(:note, project: note.project, noteable: noteable, author: another_user) post_graphql(query, current_user: user) @@ -60,6 +62,9 @@ RSpec.shared_context 'exposing regular notes on a noteable in GraphQL' do another_note = create(:note, project: note.project, noteable: noteable, author: user) create(:award_emoji, awardable: another_note, name: 'star', user: user) + another_user = create(:user).tap { |u| note.resource_parent.add_developer(u) } + note_with_different_user = create(:note, project: note.project, noteable: noteable, author: another_user) + create(:award_emoji, awardable: note_with_different_user, name: 'star', user: user) expect { post_graphql(query, current_user: user) }.not_to exceed_query_limit(control) expect_graphql_errors_to_be_empty |