diff options
Diffstat (limited to 'qa/qa/specs/features/browser_ui/2_plan')
5 files changed, 62 insertions, 9 deletions
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb index 6b309716f55..22157d648ca 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb @@ -26,7 +26,7 @@ module QA expect(show).not_to have_content(my_first_reply) show.expand_replies - expect(show).to have_content(my_first_reply) + expect(show).to have_comment(my_first_reply) expect(show).not_to have_content(one_reply) end end diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb index c9ae47459c4..d3780186f36 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb @@ -16,11 +16,11 @@ module QA show.comment(first_version_of_comment) - expect(show).to have_content(first_version_of_comment) + expect(show).to have_comment(first_version_of_comment) show.edit_comment(second_version_of_comment) - expect(show).to have_content(second_version_of_comment) + expect(show).to have_comment(second_version_of_comment) expect(show).not_to have_content(first_version_of_comment) end end diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb index 863c394a9f9..9550572bd5c 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb @@ -19,7 +19,7 @@ module QA end end - it 'closes an issue', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225303', type: :bug }, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/852' do + it 'closes an issue', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225303', type: :bug }, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1085' do closed_issue.visit! Page::Project::Issue::Show.perform do |issue_page| diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb index 9a054e7d1c8..e275c3decd3 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - RSpec.describe 'Plan', :reliable do + RSpec.describe 'Plan' do describe 'filter issue comments activities' do before do Flow::Login.sign_in @@ -18,16 +18,16 @@ module QA show.comment(my_own_comment, filter: :comments_only) expect(show).not_to have_content(made_the_issue_confidential) - expect(show).to have_content(my_own_comment) + expect(show).to have_comment(my_own_comment) show.select_all_activities_filter - expect(show).to have_content(made_the_issue_confidential) - expect(show).to have_content(my_own_comment) + expect(show).to have_system_note(made_the_issue_confidential) + expect(show).to have_comment(my_own_comment) show.select_history_only_filter - expect(show).to have_content(made_the_issue_confidential) + expect(show).to have_system_note(made_the_issue_confidential) expect(show).not_to have_content(my_own_comment) end end diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb new file mode 100644 index 00000000000..26a83fc3caa --- /dev/null +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +module QA + RSpec.describe 'Plan', :requires_admin, :actioncable, :orchestrated do + describe 'Assignees' do + let(:user1) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) } + let(:user2) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) } + let(:project) do + Resource::Project.fabricate_via_api! do |project| + project.name = 'project-to-test-assignees' + end + end + + before do + Runtime::Feature.enable('real_time_issue_sidebar', project: project) + Runtime::Feature.enable('broadcast_issue_updates', project: project) + + Flow::Login.sign_in + + project.add_member(user1) + project.add_member(user2) + end + + after do + Runtime::Feature.disable('real_time_issue_sidebar', project: project) + Runtime::Feature.disable('broadcast_issue_updates', project: project) + end + + it 'update without refresh', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1048' do + issue = Resource::Issue.fabricate_via_api! do |issue| + issue.project = project + issue.assignee_ids = [user1.id] + end + + issue.visit! + + Page::Project::Issue::Show.perform do |show| + expect(show).to have_assignee(user1.name) + + issue.set_issue_assignees(assignee_ids: [user2.id]) + + expect(show).to have_assignee(user2.name) + expect(show).to have_no_assignee_named(user1.name) + + issue.set_issue_assignees(assignee_ids: []) + + expect(show).to have_no_assignee_named(user1.name) + expect(show).to have_no_assignee_named(user2.name) + end + end + end + end +end |