diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-16 12:23:39 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-16 12:23:39 +0100 |
commit | 72f538731a233ab0f75e4ac139452806e2ee8cf0 (patch) | |
tree | 799afb125c731262291fcd5d7169674c9d43d7b9 /spec/features/environments_spec.rb | |
parent | d9d69d7ba7dd660c9b3e0ab30b58891a8b760328 (diff) | |
download | gitlab-ce-72f538731a233ab0f75e4ac139452806e2ee8cf0.tar.gz |
Remove redundant call to after branch delete service
Diffstat (limited to 'spec/features/environments_spec.rb')
-rw-r--r-- | spec/features/environments_spec.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index 8b34cb13b9d..e57c355916d 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -291,11 +291,26 @@ feature 'Environments', feature: true do scenario 'user deletes the branch with running environment' do visit namespace_project_branches_path(project.namespace, project) - page.within('.js-branch-feature') { find('a.btn-remove').click } + remove_branch_with_hooks(project, user, 'feature') do + page.within('.js-branch-feature') { find('a.btn-remove').click } + end + visit_environment(environment) expect(page).to have_no_link('Stop') end + + def remove_branch_with_hooks(project, user, branch) + params = { + oldrev: project.commit(branch).id, + newrev: Gitlab::Git::BLANK_SHA, + ref: "refs/heads/#{branch}" + } + + yield + + GitPushService.new(project, user, params).execute + end end def visit_environments(project) |