summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-03-12 16:18:06 +0000
committerPhil Hughes <me@iamphill.com>2018-03-13 09:41:09 +0000
commit611601430dde46562b0049c5b5f5be656f7caae2 (patch)
tree69e428a68061ea0c912f54c5745638e891c8637f
parentef24633393f7a0a1ca78dcfa7e7f0c4a87f3c56c (diff)
downloadgitlab-ce-611601430dde46562b0049c5b5f5be656f7caae2.tar.gz
fixed eslint
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js11
-rw-r--r--spec/javascripts/vue_mr_widget/mr_widget_options_spec.js2
2 files changed, 2 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 0c77ad80f74..3675a2eaa85 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -133,16 +133,7 @@ export default {
.then(res => res.data)
.then((data) => {
if (data.length) {
- data[0].stop_url = 'asd';
- this.mr.deployments = data.concat({
- ...data[0],
- id: data[0].id + 1,
- name: 'review/1-make-homepage-more-descriptive',
- deployed_at: new Date(),
- deployed_at_formatted: '123',
- external_url_formatted: 'ad3-minmal-ruby-app-review-1-make-hom-gnm6yk.gitlab.training',
- metrics_url: 'a',
- });
+ this.mr.deployments = data;
}
})
.catch(() => {
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index 1dc5da26d04..e235776fe3d 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -12,7 +12,7 @@ const returnPromise = data => new Promise((resolve) => {
});
});
-fdescribe('mrWidgetOptions', () => {
+describe('mrWidgetOptions', () => {
let vm;
let MrWidgetOptions;