diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 06:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-02 06:09:10 +0300 |
commit | 7580728fc297c86cc5a31fb67e7153217facf1c0 (patch) | |
tree | 59279991d34f28fc1b415a14e77df08d5c11d265 /qa | |
parent | d8714cf67ce4db786b26b64f0f0bef50fb6976e6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
3 files changed, 7 insertions, 12 deletions
diff --git a/qa/qa/flow/project.rb b/qa/qa/flow/project.rb index db42a3a3594..8a9e2c86332 100644 --- a/qa/qa/flow/project.rb +++ b/qa/qa/flow/project.rb @@ -5,16 +5,6 @@ module QA module Project module_function - def add_member(project:, username:) - project.visit! - - Page::Project::Menu.perform(&:click_members) - - Page::Project::Members.perform do |member_settings| - member_settings.add_member(username) - end - end - def go_to_create_project_from_template if Page::Project::NewExperiment.perform(&:shown?) Page::Project::NewExperiment.perform(&:click_create_from_template_link) diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb index 418865a63d2..fbaf4241cec 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb @@ -20,7 +20,12 @@ module QA end it 'is received by a user for project invitation', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/676' do - Flow::Project.add_member(project: project, username: user.username) + project.visit! + + Page::Project::Menu.perform(&:click_members) + Page::Project::Members.perform do |member_settings| + member_settings.add_member(user.username) + end expect(page).to have_content(/@#{user.username}(\n| )?Given access/) diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb index e394f6b1e9c..a7f862e8911 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb @@ -20,7 +20,7 @@ module QA before do Flow::Login.sign_in - Flow::Project.add_member(project: project, username: user.username) + project.add_member(user) Resource::Issue.fabricate_via_api! do |issue| issue.project = project |