Commit 61285da4 authored by Felipe Artur's avatar Felipe Artur

Small review changes

parent 4a802000
......@@ -26,7 +26,7 @@ module QA
end
def fast_forward_possible?
!page.has_text?("Fast-forward merge is not possible")
!has_text?("Fast-forward merge is not possible")
end
def has_merge_button?
......
......@@ -4,17 +4,22 @@ module QA
Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials }
merge_request =
Factory::Resource::MergeRequest.fabricate! do |merge_request|
merge_request.title = 'Squashing commits'
end
project = Factory::Resource::Project.fabricate! do |project|
project.name = "squash-before-merge"
end
merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request|
merge_request.project = project
merge_request.title = 'Squashing commits'
end
Factory::Repository::Push.fabricate! do |push|
push.project = merge_request.project
push.project = project
push.commit_message = 'to be squashed'
push.branch_name = merge_request.source_branch
push.new_branch = false
push.file_name = 'other.txt'
push.file_content = "Test with unicode characters ❤✓€❄"
end
merge_request.visit!
......
......@@ -5,7 +5,7 @@ module QA
Page::Main::Login.act { sign_in_using_credentials }
project = Factory::Resource::Project.fabricate! do |project|
project.name = "no-fast-forward"
project.name = "only-fast-forward"
end
Page::Menu::Side.act { go_to_settings }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment