diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 11:34:46 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 11:34:46 -0600 |
commit | bcfa80087aff906a93a231f957f40ed067927f67 (patch) | |
tree | af11a89ce940092b00a25f1f353c5f852eef22f7 /qa/qa/specs/features/merge_request/rebase_spec.rb | |
parent | e1fc17fb89b2cdb0a37ae98fe24668a7a29aa88f (diff) | |
parent | e0195f3369880d3a0b3c5c7e7e5bdee26b785c4a (diff) | |
download | gitlab-ce-4536-move-ee-specific-javascripts-files-to.tar.gz |
Merge branch 'master' into 4536-move-ee-specific-javascripts-files-to4536-move-ee-specific-javascripts-files-to
Diffstat (limited to 'qa/qa/specs/features/merge_request/rebase_spec.rb')
-rw-r--r-- | qa/qa/specs/features/merge_request/rebase_spec.rb | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/qa/qa/specs/features/merge_request/rebase_spec.rb b/qa/qa/specs/features/merge_request/rebase_spec.rb new file mode 100644 index 00000000000..2a44d42af6f --- /dev/null +++ b/qa/qa/specs/features/merge_request/rebase_spec.rb @@ -0,0 +1,39 @@ +module QA + feature 'merge request rebase', :core do + scenario 'rebases source branch of merge request' do + Runtime::Browser.visit(:gitlab, Page::Main::Login) + Page::Main::Login.act { sign_in_using_credentials } + + project = Factory::Resource::Project.fabricate! do |project| + project.name = "only-fast-forward" + end + + Page::Menu::Side.act { go_to_settings } + Page::Project::Settings::MergeRequest.act { enable_ff_only } + + merge_request = Factory::Resource::MergeRequest.fabricate! do |merge_request| + merge_request.project = project + merge_request.title = 'Needs rebasing' + end + + Factory::Repository::Push.fabricate! do |push| + push.project = project + push.file_name = "other.txt" + push.file_content = "New file added!" + end + + merge_request.visit! + + Page::MergeRequest::Show.perform do |merge_request| + expect(merge_request).to have_content('Needs rebasing') + expect(merge_request).not_to be_fast_forward_possible + expect(merge_request).not_to have_merge_button + + merge_request.rebase! + + expect(merge_request).to have_merge_button + expect(merge_request.fast_forward_possible?).to be_truthy + end + end + end +end |