diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-07 03:19:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-07 03:19:17 +0300 |
commit | 75b46eb33cd5dd542c69919a8bd5338933b79ecb (patch) | |
tree | a0704c082e4c474a8d65553c73b0bbd6808e41ba /qa | |
parent | ea3f6d2444fd63f0ccaa0707d0ccbc59ec9af040 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb | 49 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_new/add_new_directory_in_web_ide_spec.rb | 77 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/add_file_template_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/create_first_file_in_web_ide_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/link_to_line_in_web_ide_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/open_web_ide_from_diff_tab_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/review_merge_request_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/server_hooks_custom_error_message_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb) | 6 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide_old/upload_new_file_in_web_ide_spec.rb (renamed from qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb) | 6 |
9 files changed, 57 insertions, 111 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb index e5e3941e0cd..9650c9b0c1a 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled module QA - RSpec.describe 'Create', :skip_live_env, product_group: :editor do + RSpec.describe 'Create', product_group: :editor do describe 'Add a directory in Web IDE' do let(:project) do Resource::Project.fabricate_via_api! do |project| @@ -30,23 +29,18 @@ module QA } ]) end - project.visit! - - Page::Project::Show.perform(&:open_web_ide!) end - it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347733' do - Page::Project::WebIDE::Edit.perform do |ide| - # Support::Waiter.wait_until(sleep_interval: 2, max_duration: 60, reload_page: page, - # retry_on_exception: true) do - # expect(ide).to have_element(:commit_mode_tab) - # end - ide.wait_until_ide_loads - ide.add_directory(directory_name) + it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386760' do + Page::Project::Show.perform(&:open_web_ide!) + Page::Project::WebIDE::VSCode.perform do |ide| + ide.wait_for_ide_to_load + ide.create_new_folder(directory_name) + ide.within_vscode_editor do + expect(page).to have_content('A file or folder first_directory already exists at this location.') + end end - - expect(page).to have_content('The name "first_directory" is already taken in this directory.') end end @@ -57,18 +51,19 @@ module QA Page::Project::Show.perform(&:open_web_ide!) end - it 'shows in the tree view but cannot be committed', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347732' do - Page::Project::WebIDE::Edit.perform do |ide| - ide.wait_until_ide_loads - ide.add_directory(directory_name) - - expect(ide).to have_file(directory_name) - expect(ide).to have_folder_icon(directory_name) - expect(ide).not_to have_file_addition_icon(directory_name) - - ide.switch_to_commit_tab - - expect(ide).not_to have_file_to_commit(directory_name) + it 'shows successfully but not able to be committed', + testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386761', + quarantine: { + type: :stale, + issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/399544' + } do + Page::Project::WebIDE::VSCode.perform do |ide| + ide.wait_for_ide_to_load + ide.create_new_folder(directory_name) + ide.commit_and_push(directory_name) + ide.within_vscode_editor do + expect(page).to have_content('No changes found. Not able to commit.') + end end end end diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide_new/add_new_directory_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_new/add_new_directory_in_web_ide_spec.rb deleted file mode 100644 index f81b8c2cf23..00000000000 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide_new/add_new_directory_in_web_ide_spec.rb +++ /dev/null @@ -1,77 +0,0 @@ -# frozen_string_literal: true - -module QA - RSpec.describe 'Create', feature_flag: { name: 'vscode_web_ide', scope: :global }, product_group: :editor do - describe 'Add a directory in Web IDE' do - let(:project) do - Resource::Project.fabricate_via_api! do |project| - project.name = 'add-directory-project' - project.initialize_with_readme = true - end - end - - before do - Runtime::Feature.enable(:vscode_web_ide) - Flow::Login.sign_in - project.visit! - end - - after do - Runtime::Feature.disable(:vscode_web_ide) - end - - context 'when a directory with the same name already exists' do - let(:directory_name) { 'first_directory' } - - before do - Resource::Repository::Commit.fabricate_via_api! do |commit| - commit.project = project - commit.add_files( - [ - { - file_path: 'first_directory/test_file.txt', - content: "Test file content" - } - ]) - end - project.visit! - end - - it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386760' do - Page::Project::Show.perform(&:open_web_ide!) - Page::Project::WebIDE::VSCode.perform do |ide| - ide.wait_for_ide_to_load - ide.create_new_folder(directory_name) - ide.within_vscode_editor do - expect(page).to have_content('A file or folder first_directory already exists at this location.') - end - end - end - end - - context 'when user adds a new empty directory' do - let(:directory_name) { 'new_empty_directory' } - - before do - Page::Project::Show.perform(&:open_web_ide!) - end - - it 'shows successfully but not able to be committed', - testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386761', - quarantine: { - type: :stale, - issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/399544' - } do - Page::Project::WebIDE::VSCode.perform do |ide| - ide.wait_for_ide_to_load - ide.create_new_folder(directory_name) - ide.commit_and_push(directory_name) - ide.within_vscode_editor do - expect(page).to have_content('No changes found. Not able to commit.') - end - end - end - end - end - end -end diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/add_file_template_spec.rb index cf1e4700863..d046a6fb0c5 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/add_file_template_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Web IDE file templates' do include Runtime::Fixtures diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/create_first_file_in_web_ide_spec.rb index 58afdfe7cd1..047490bd31e 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/create_first_file_in_web_ide_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'First file using Web IDE' do let(:project) do Resource::Project.fabricate_via_api! do |project| diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/link_to_line_in_web_ide_spec.rb index 9c40a3abe52..aeb7a20a15b 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/link_to_line_in_web_ide_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Link to line in Web IDE' do let(:user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) } let(:project) do diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/open_web_ide_from_diff_tab_spec.rb index bbfc3ba8ccd..92e4ed11ea7 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/open_web_ide_from_diff_tab_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Open Web IDE from Diff Tab' do files = [ { diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/review_merge_request_spec.rb index 05c58b66b09..34e445d6c1c 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/review_merge_request_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Review a merge request in Web IDE' do let(:new_file) { 'awesome_new_file.txt' } let(:original_text) { 'Text' } diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/server_hooks_custom_error_message_spec.rb index 8082c54a6ee..e3ffeba6902 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/server_hooks_custom_error_message_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' }, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Git Server Hooks' do let(:file_path) { File.join(Runtime::Path.fixtures_path, 'web_ide', 'README.md') } diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/upload_new_file_in_web_ide_spec.rb index abc7c37a1d4..d83e2517cff 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide_old/upload_new_file_in_web_ide_spec.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true -# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled +# TODO: remove this test when coverage is replaced or deemed irrelevant module QA RSpec.describe 'Create', :skip_live_env, product_group: :editor do + before do + skip("Skipped but kept as reference. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115741#note_1330720944") + end + describe 'Upload a file in Web IDE' do let(:file_path) { File.join(Runtime::Path.fixtures_path, 'web_ide', file_name) } |