diff options
| author | Christiaan Van den Poel <christiaan.vandenpoel@gmail.com> | 2017-11-23 17:34:52 +0100 |
|---|---|---|
| committer | Christiaan Van den Poel <christiaan.vandenpoel@protime.eu> | 2017-11-27 20:31:45 +0100 |
| commit | 4fae2574c41f0e2248989b9dac8738d546ea0217 (patch) | |
| tree | b52b3aa80423317634de9780f9cc70e159585471 | |
| parent | a7f6ab952acc58e7ef9a33fba3fbaaa0918572fe (diff) | |
| download | gitlab-ce-4fae2574c41f0e2248989b9dac8738d546ea0217.tar.gz | |
initializes the branches dropdown upon invalid entry
Added Changelog
added feature spec
3 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 34708977d20..7df1cbe854d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -383,6 +383,7 @@ import ProjectVariables from './project_variables'; projectImport(); break; case 'projects:pipelines:new': + case 'projects:pipelines:create': new NewBranchForm($('.js-new-pipeline-form')); break; case 'projects:pipelines:builds': diff --git a/changelogs/unreleased/15588-fix-empty-dropdown-on-create-new-pipeline-in-case-of-validation-errors.yml b/changelogs/unreleased/15588-fix-empty-dropdown-on-create-new-pipeline-in-case-of-validation-errors.yml new file mode 100644 index 00000000000..a4934c8896d --- /dev/null +++ b/changelogs/unreleased/15588-fix-empty-dropdown-on-create-new-pipeline-in-case-of-validation-errors.yml @@ -0,0 +1,5 @@ +--- +title: Initializes the branches dropdown when the 'Start new pipeline' failed due to validation errors +merge_request: 15588 +author: Christiaan Van den Poel +type: fixed diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 50f8f13d261..a1b1d94ae06 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -500,6 +500,18 @@ describe 'Pipelines', :js do end it { expect(page).to have_content('Missing .gitlab-ci.yml file') } + it 'creates a pipeline after first request failed and a valid gitlab-ci.yml file is available when trying again' do + click_button project.default_branch + + stub_ci_pipeline_to_return_yaml_file + + page.within '.dropdown-menu' do + click_link 'master' + end + + expect { click_on 'Create pipeline' } + .to change { Ci::Pipeline.count }.by(1) + end end end end |