From 707ae1e08d8fa62bb4ca04d026042b8f895ab225 Mon Sep 17 00:00:00 2001 From: Alexander Graul Date: Thu, 30 Nov 2017 15:24:46 +0100 Subject: [PATCH] [webui] add branch destination information Show (and link to if it already exists) resulting project on the 'Branch Confirmation' Dialog. Fixes #2171 --- src/api/app/views/webui/package/_branch_dialog.html.erb | 5 ++++- src/api/spec/features/webui/maintenance_workflow_spec.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/api/app/views/webui/package/_branch_dialog.html.erb b/src/api/app/views/webui/package/_branch_dialog.html.erb index 25f63ee095e..adc4abd0af9 100644 --- a/src/api/app/views/webui/package/_branch_dialog.html.erb +++ b/src/api/app/views/webui/package/_branch_dialog.html.erb @@ -3,7 +3,10 @@

Branch Confirmation

- Do you really want to branch <%= package_link(@package) %>?

+ Do you want to branch <%= package_link(@package) %> into + <%= project_or_package_link( + project: User.current.branch_project_name(@package.project.name), + short: true) %>?

[+] More options

diff --git a/src/api/spec/features/webui/maintenance_workflow_spec.rb b/src/api/spec/features/webui/maintenance_workflow_spec.rb index dc7ad528726..2f858296b7b 100644 --- a/src/api/spec/features/webui/maintenance_workflow_spec.rb +++ b/src/api/spec/features/webui/maintenance_workflow_spec.rb @@ -34,7 +34,7 @@ visit package_show_path(project: update_project, package: package) click_link('Branch package') - expect(page).to have_text('Do you really want to branch package') + expect(page).to have_text('Do you want to branch package') click_button('Ok') expect(page).to have_text('Successfully branched package')