diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-11 12:18:53 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-11 12:18:53 +0100 |
commit | 1991a454b3873a6e8fd4abb965b45ca1588ef34a (patch) | |
tree | f5725cb46cbe93773b2c4dea1b1ed9894fcd4524 | |
parent | 93f8b06758aa71bf6d4c9b09d9e99a0a67aa47e0 (diff) | |
download | gitlab-ce-45715-remove-modal-retry.tar.gz |
Uses a new event to retry pipeline45715-remove-modal-retry
4 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index 04973309093..498a97851fa 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -238,7 +238,7 @@ }, handleRetryClick() { this.isRetrying = true; - eventHub.$emit('postAction', this.pipeline.retry_path); + eventHub.$emit('retryPipeline', this.pipeline.retry_path); }, }, }; diff --git a/app/assets/javascripts/pipelines/mixins/pipelines.js b/app/assets/javascripts/pipelines/mixins/pipelines.js index 6d87f75ae8e..de0faf181e5 100644 --- a/app/assets/javascripts/pipelines/mixins/pipelines.js +++ b/app/assets/javascripts/pipelines/mixins/pipelines.js @@ -53,10 +53,12 @@ export default { }); eventHub.$on('postAction', this.postAction); + eventHub.$on('retryPipeline', this.postAction); eventHub.$on('clickedDropdown', this.updateTable); }, beforeDestroy() { eventHub.$off('postAction', this.postAction); + eventHub.$off('retryPipeline', this.postAction); eventHub.$off('clickedDropdown', this.updateTable); }, destroyed() { diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 90e28483c6c..9c165b17704 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -125,7 +125,7 @@ describe 'Pipelines', :js do context 'when canceling' do before do find('.js-pipelines-cancel-button').click - find('.js-primary-button').click + find('.js-modal-primary-action').click wait_for_requests end @@ -156,7 +156,6 @@ describe 'Pipelines', :js do context 'when retrying' do before do find('.js-pipelines-retry-button').click - find('.js-primary-button').click wait_for_requests end @@ -256,7 +255,7 @@ describe 'Pipelines', :js do context 'when canceling' do before do find('.js-pipelines-cancel-button').click - find('.js-primary-button').click + find('.js-modal-primary-action').click end it 'indicates that pipeline was canceled' do diff --git a/spec/javascripts/pipelines/pipelines_table_row_spec.js b/spec/javascripts/pipelines/pipelines_table_row_spec.js index 1a213339e4f..05ca4cb9044 100644 --- a/spec/javascripts/pipelines/pipelines_table_row_spec.js +++ b/spec/javascripts/pipelines/pipelines_table_row_spec.js @@ -166,8 +166,8 @@ describe('Pipelines Table Row', () => { expect(component.$el.querySelector('.js-pipelines-cancel-button')).not.toBeNull(); }); - it('emits `postAction` event when retry button is clicked and toggles loading', () => { - eventHub.$on('postAction', (endpoint) => { + it('emits `retryPipeline` event when retry button is clicked and toggles loading', () => { + eventHub.$on('retryPipeline', (endpoint) => { expect(endpoint).toEqual('/retry'); }); |