diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-01-30 07:01:31 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-07 01:12:24 +0300 |
commit | 3aa1264dc6c0de3625bb1a2d6a0ee90140a2f519 (patch) | |
tree | 73b450be24d8ea336adedca5dc2ed2edd02474c6 /spec/features/projects/commits | |
parent | 8f85a11d9fcc1f4ccde7c46652f0be00edf46a78 (diff) |
Add tests
Diffstat (limited to 'spec/features/projects/commits')
-rw-r--r-- | spec/features/projects/commits/cherry_pick_spec.rb | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/spec/features/projects/commits/cherry_pick_spec.rb b/spec/features/projects/commits/cherry_pick_spec.rb deleted file mode 100644 index 7baf7913424..00000000000 --- a/spec/features/projects/commits/cherry_pick_spec.rb +++ /dev/null @@ -1,89 +0,0 @@ -require 'spec_helper' -include WaitForAjax - -describe 'Cherry-pick Commits' do - let(:group) { create(:group) } - let(:project) { create(:project, namespace: group) } - let(:master_pickable_commit) { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') } - let(:master_pickable_merge) { project.commit('e56497bb5f03a90a51293fc6d516788730953899') } - - before do - login_as :user - project.team << [@user, :master] - visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id) - end - - context "I cherry-pick a commit" do - it do - find("a[href='#modal-cherry-pick-commit']").click - expect(page).not_to have_content('v1.0.0') # Only branches, not tags - page.within('#modal-cherry-pick-commit') do - uncheck 'create_merge_request' - click_button 'Cherry-pick' - end - expect(page).to have_content('The commit has been successfully cherry-picked.') - end - end - - context "I cherry-pick a merge commit" do - it do - find("a[href='#modal-cherry-pick-commit']").click - page.within('#modal-cherry-pick-commit') do - uncheck 'create_merge_request' - click_button 'Cherry-pick' - end - expect(page).to have_content('The commit has been successfully cherry-picked.') - end - end - - context "I cherry-pick a commit that was previously cherry-picked" do - it do - find("a[href='#modal-cherry-pick-commit']").click - page.within('#modal-cherry-pick-commit') do - uncheck 'create_merge_request' - click_button 'Cherry-pick' - end - visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id) - find("a[href='#modal-cherry-pick-commit']").click - page.within('#modal-cherry-pick-commit') do - uncheck 'create_merge_request' - click_button 'Cherry-pick' - end - expect(page).to have_content('Sorry, we cannot cherry-pick this commit automatically.') - end - end - - context "I cherry-pick a commit in a new merge request" do - it do - find("a[href='#modal-cherry-pick-commit']").click - page.within('#modal-cherry-pick-commit') do - click_button 'Cherry-pick' - end - expect(page).to have_content('The commit has been successfully cherry-picked. You can now submit a merge request to get this change into the original branch.') - end - end - - context "I cherry-pick a commit from a different branch", js: true do - it do - find('.header-action-buttons a.dropdown-toggle').click - find(:css, "a[href='#modal-cherry-pick-commit']").click - - page.within('#modal-cherry-pick-commit') do - click_button 'master' - end - - wait_for_ajax - - page.within('#modal-cherry-pick-commit .dropdown-menu .dropdown-content') do - click_link 'feature' - end - - page.within('#modal-cherry-pick-commit') do - uncheck 'create_merge_request' - click_button 'Cherry-pick' - end - - expect(page).to have_content('The commit has been successfully cherry-picked.') - end - end -end |