Merge branch 'qa-update-merge-request-page' into 'master'

Update merge request page object and rebase test

Closes gitlab-org/quality/staging#3

See merge request gitlab-org/gitlab-ce!24375

1 files changed, 4 insertions, 4 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
index 43cc737bfb1..3fbcd77dac6 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
@@ -5,15 +5,15 @@ module QA
     describe 'Merge request rebasing' do
       it 'user rebases source branch of merge request' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.act { sign_in_using_credentials }
+        Page::Main::Login.perform(&:sign_in_using_credentials)
 
         project = Resource::Project.fabricate! do |project|
           project.name = "only-fast-forward"
         end
         project.visit!
 
-        Page::Project::Menu.act { go_to_settings }
-        Page::Project::Settings::MergeRequest.act { enable_ff_only }
+        Page::Project::Menu.perform(&:go_to_settings)
+        Page::Project::Settings::MergeRequest.perform(&:enable_ff_only)
 
         merge_request = Resource::MergeRequest.fabricate! do |merge_request|
           merge_request.project = project
@@ -38,7 +38,7 @@ module QA
           merge_request.rebase!
 
           expect(merge_request).to have_merge_button
-          expect(merge_request.fast_forward_possible?).to be_truthy
+          expect(merge_request).to be_fast_forward_possible
         end
       end
     end