kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Small review changes

Browse source
This commit is contained in:
Felipe Artur 2018-02-22 14:06:38 -03:00
parent 73e5039573
commit 9870c05516
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qa/qa/page/merge_request/show.rb
View file

@ -24,7 +24,7 @@ module QA
end end
def fast_forward_possible? def fast_forward_possible?
!page.has_text?("Fast-forward merge is not possible") !has_text?("Fast-forward merge is not possible")
end end
def has_merge_button? def has_merge_button?

2
qa/qa/specs/features/merge_request/rebase_spec.rb
View file

@ -5,7 +5,7 @@ module QA
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
project = Factory::Resource::Project.fabricate! do |project| project = Factory::Resource::Project.fabricate! do |project|
project.name = "no-fast-forward" project.name = "only-fast-forward"
end end
Page::Menu::Side.act { go_to_settings } Page::Menu::Side.act { go_to_settings }