diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 03:08:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 03:08:14 +0300 |
| commit | 427c549b6396885fb60a687326b6cd62878e4ca3 (patch) | |
| tree | 145713e2f6fdaf7499b0cb44010503e16b6248b9 /qa | |
| parent | 74a89b1221eaf780374bd1d4c5b2ee4a0f488908 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
3 files changed, 5 insertions, 12 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 8e41417049b..314a951ba89 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 @@ -8,11 +8,9 @@ module QA before do Flow::Login.sign_in - issue = Resource::Issue.fabricate_via_api! do |issue| + Resource::Issue.fabricate_via_api! do |issue| issue.title = 'issue title' - end - - issue.visit! + end.visit! Page::Project::Issue::Show.perform do |show| show.select_all_activities_filter 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 77489c0ecf5..9234227eff7 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 @@ -6,10 +6,9 @@ module QA before do Flow::Login.sign_in - issue = Resource::Issue.fabricate_via_api! do |issue| + Resource::Issue.fabricate_via_api! do |issue| issue.title = 'issue title' - end - issue.visit! + end.visit! end it 'user comments on an issue and edits the comment' do diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb index 341e6fd0096..b323ee26e47 100644 --- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb +++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb @@ -12,12 +12,8 @@ module QA resource.name = 'project-to-test-mention' resource.visibility = 'private' end - project.visit! - Page::Project::Show.perform(&:go_to_members_settings) - Page::Project::Settings::Members.perform do |members| - members.add_member(@user.username) - end + project.add_member(@user) Resource::Issue.fabricate_via_api! do |issue| issue.title = 'issue to test mention' |