From f9a662c38fc8bbcee66ab08db53f86bdad146784 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sat, 19 Nov 2016 12:37:54 +0000
Subject: [PATCH] Changes for stop url to path
---
.../components/environment_stop.js.es6 | 8 +-------
.../environments/environment_stop_spec.js.es6 | 16 ----------------
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/app/assets/javascripts/environments/components/environment_stop.js.es6 b/app/assets/javascripts/environments/components/environment_stop.js.es6
index 171d2d7fae3..bfcca40f8c0 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js.es6
+++ b/app/assets/javascripts/environments/components/environment_stop.js.es6
@@ -13,12 +13,6 @@
},
},
- computed: {
- stopUrl() {
- return this.stop_url;
- },
- },
-
methods: {
openConfirmDialog() {
return window.confirm('Are you sure you want to stop this environment?'); // eslint-disable-line
@@ -28,7 +22,7 @@
template: `
<a v-on:click="openConfirmDialog"
class="btn stop-env-link"
- :href="stopUrl"
+ :href="stop_url"
data-method="post"
rel="nofollow">
<i class="fa fa-stop stop-env-icon"></i>
diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6
index d3eff278292..37fba925e16 100644
--- a/spec/javascripts/environments/environment_stop_spec.js.es6
+++ b/spec/javascripts/environments/environment_stop_spec.js.es6
@@ -16,20 +16,4 @@ describe('Stop Component', () => {
});
expect(component.$el.getAttribute('href')).toEqual(stopURL);
});
-
- describe('When clicked', () => {
- it('Should open popup with confirmation warning', () => {
- const component = new window.gl.environmentsList.StopComponent({
- el: document.querySelector('.test-dom-element'),
- propsData: {
- stop_url: '#',
- },
- });
-
- var confirm = spyOn(window, 'confirm');
- confirm.and.returnValue(false);
- component.$el.click();
- expect(confirm).toHaveBeenCalled();
- });
- });
});
--
GitLab