diff options
8 files changed, 12 insertions, 11 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js index 4e209e2ed05..a9f2d462c31 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js @@ -1,6 +1,8 @@ /* eslint-disable no-param-reassign */ import CommitPipelinesTable from './pipelines_table'; -import Vue from 'vue'; + +window.Vue = require('vue'); +window.Vue.use(require('vue-resource')); /** * Commits View > Pipelines Tab > Pipelines Table. diff --git a/app/assets/javascripts/vue_pipelines_index/components/status.js b/app/assets/javascripts/vue_pipelines_index/components/status.js index 414b6fc4316..21a281af438 100644 --- a/app/assets/javascripts/vue_pipelines_index/components/status.js +++ b/app/assets/javascripts/vue_pipelines_index/components/status.js @@ -36,7 +36,7 @@ export default { computed: { cssClasses() { - return `ci-status ci-status-${this.pipeline.details.status.group}`; + return `ci-status ci-${this.pipeline.details.status.group}`; }, detailsPath() { diff --git a/app/assets/javascripts/vue_pipelines_index/index.js b/app/assets/javascripts/vue_pipelines_index/index.js index 104154a715b..b4e2d3a1143 100644 --- a/app/assets/javascripts/vue_pipelines_index/index.js +++ b/app/assets/javascripts/vue_pipelines_index/index.js @@ -1,8 +1,10 @@ -import Vue from 'vue'; import PipelinesStore from './stores/pipelines_store'; import PipelinesComponent from './pipelines'; import '../vue_shared/vue_resource_interceptor'; +const Vue = window.Vue = require('vue'); +window.Vue.use(require('vue-resource')); + $(() => new Vue({ el: document.querySelector('.vue-pipelines-index'), diff --git a/app/assets/javascripts/vue_shared/components/pipelines_table_row.js b/app/assets/javascripts/vue_shared/components/pipelines_table_row.js index d76454a61da..f5b3cb9214e 100644 --- a/app/assets/javascripts/vue_shared/components/pipelines_table_row.js +++ b/app/assets/javascripts/vue_shared/components/pipelines_table_row.js @@ -209,7 +209,7 @@ export default { v-if="pipeline.flags.retryable" :service="service" :endpoint="pipeline.retry_path" - css-class="btn-default btn-retry" + css-class="js-pipelines-retry-button btn-default btn-retry" title="Retry" icon="repeat" /> @@ -217,7 +217,7 @@ export default { v-if="pipeline.flags.cancelable" :service="service" :endpoint="pipeline.cancel_path" - css-class="btn-remove" + css-class="js-pipelines-cancel-button btn-remove" title="Cancel" icon="remove" confirm-action-message="Are you sure you want to cancel this pipeline?" /> diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb index 435fd9c75b5..18833ba7266 100644 --- a/spec/features/merge_requests/created_from_fork_spec.rb +++ b/spec/features/merge_requests/created_from_fork_spec.rb @@ -60,9 +60,6 @@ feature 'Merge request created from fork' do expect(page).to have_content pipeline.status expect(page).to have_content pipeline.id end - - expect(page.find('button.btn-remove')[:href]) - .to include fork_project.path_with_namespace end end diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 2232e8db415..162056671e0 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -192,7 +192,7 @@ describe 'Pipelines', :feature, :js do end it 'enqueues manual action job' do - expect(manual.reload).to be_pending + expect(page).to have_selector('.js-pipeline-dropdown-manual-actions:disabled') end end end diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js b/spec/javascripts/commit/pipelines/pipelines_spec.js index d976f222a0b..75efcc06585 100644 --- a/spec/javascripts/commit/pipelines/pipelines_spec.js +++ b/spec/javascripts/commit/pipelines/pipelines_spec.js @@ -28,7 +28,6 @@ describe('Pipelines table in Commits and Merge requests', () => { }); it('should render the empty state', (done) => { - const component = new PipelinesTable({ el: document.querySelector('#commit-pipeline-table-view'), }); diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js b/spec/javascripts/vue_shared/components/table_pagination_spec.js index 514a3a96374..a5c3870b3ac 100644 --- a/spec/javascripts/vue_shared/components/table_pagination_spec.js +++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js @@ -1,3 +1,4 @@ +import Vue from 'vue'; import paginationComp from '~/vue_shared/components/table_pagination'; import '~/lib/utils/common_utils'; @@ -15,7 +16,7 @@ describe('Pagination component', () => { beforeEach(() => { PaginationComponent = Vue.extend(paginationComp); - }) + }); it('should render and start at page 1', () => { component = new PaginationComponent({ |