summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/environments_spec.rb17
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)