summaryrefslogtreecommitdiff
path: root/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb')
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
index b58e820a6c9..d2ba97400e6 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
@@ -2,21 +2,23 @@
module QA
RSpec.describe 'Create' do
- describe 'Merge request creation from fork' do
- let(:merge_request) do
- Resource::MergeRequestFromFork.fabricate_via_api! do |merge_request|
+ describe 'Merge request creation from fork', :smoke do
+ let!(:merge_request) do
+ Resource::MergeRequestFromFork.fabricate_via_browser_ui! do |merge_request|
merge_request.fork_branch = 'feature-branch'
end
end
it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/928' do
- Flow::Login.sign_in
+ Flow::Login.while_signed_in do
+ merge_request.visit!
- merge_request.visit!
+ Page::MergeRequest::Show.perform do |merge_request|
+ merge_request.merge!
- Page::MergeRequest::Show.perform(&:merge!)
-
- expect(page).to have_content('The changes were merged')
+ expect(merge_request).to have_content('The changes were merged')
+ end
+ end
end
end
end