diff options
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/merge_request/rebase_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index c97d032a7fb..35875487da8 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -24,7 +24,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? diff --git a/qa/qa/specs/features/merge_request/rebase_spec.rb b/qa/qa/specs/features/merge_request/rebase_spec.rb index 62b02624231..2a44d42af6f 100644 --- a/qa/qa/specs/features/merge_request/rebase_spec.rb +++ b/qa/qa/specs/features/merge_request/rebase_spec.rb @@ -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 } |