summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-07-14 12:05:46 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-07-14 12:05:46 +0100
commit5dfd9fb0e6d5cb5d3e645e87d9dd2b6f2be39260 (patch)
treec3ff97cb65983566fefe7df8ebab7d1e3c6d2bcf
parentd7f13d656d6b172458851de7fd9feddd51275bfd (diff)
downloadgitlab-ce-34075-pipelines-count-mt.tar.gz
Small fixes after review34075-pipelines-count-mt
-rw-r--r--app/assets/javascripts/commit/pipelines/pipelines_bundle.js4
-rw-r--r--app/assets/javascripts/commit/pipelines/pipelines_table.vue2
-rw-r--r--spec/javascripts/commit/pipelines/pipelines_spec.js7
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
index 54b1ab9b449..687f09882a7 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
@@ -24,7 +24,9 @@ document.addEventListener('DOMContentLoaded', () => {
if (event.detail.pipelines &&
event.detail.pipelines.count &&
event.detail.pipelines.count.all) {
- document.querySelector('.js-pipelines-mr-count').textContent = event.detail.pipelines.count.all;
+ const badge = document.querySelector('.js-pipelines-mr-count');
+
+ badge.textContent = event.detail.pipelines.count.all;
}
});
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
index d6383a585ec..dd751ec97a8 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue
@@ -63,7 +63,7 @@
});
// notifiy to update the count in tabs
- if (this.$el.parentElement !== null) {
+ if (this.$el.parentElement) {
this.$el.parentElement.dispatchEvent(updatePipelinesEvent);
}
});
diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js b/spec/javascripts/commit/pipelines/pipelines_spec.js
index 8aba8b9e751..a34cadec0ab 100644
--- a/spec/javascripts/commit/pipelines/pipelines_spec.js
+++ b/spec/javascripts/commit/pipelines/pipelines_spec.js
@@ -86,7 +86,7 @@ describe('Pipelines table in Commits and Merge requests', () => {
});
});
- describe('with a parent element', () => {
+ describe('pipeline badge counts', () => {
const pipelinesResponse = (request, next) => {
next(request.respondWith(JSON.stringify([pipeline]), {
status: 200,
@@ -102,10 +102,11 @@ describe('Pipelines table in Commits and Merge requests', () => {
this.component.$destroy();
});
- it('should dispatch event', (done) => {
+ it('should receive update-pipelines-count event', (done) => {
const element = document.createElement('div');
+ document.body.appendChild(element);
- $(element).on('update-pipelines-count', (event) => {
+ element.addEventListener('update-pipelines-count', (event) => {
expect(event.detail.pipelines).toEqual([pipeline]);
done();
});