kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Enable terminals button for group clusters

Browse source
This commit is contained in:
Tiger 2019-07-02 19:01:15 +10:00
parent 29b8830bf8
commit 2b1dcc815b
3 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/environments/components/environment_item.vue
View file

@ -15,7 +15,6 @@ import MonitoringButtonComponent from './environment_monitoring.vue';
import CommitComponent from '../../vue_shared/components/commit.vue';
import eventHub from '../event_hub';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { CLUSTER_TYPE } from '~/clusters/constants';
/**
* Environment Item Component
@ -80,15 +79,6 @@ export default {
return this.model && this.model.is_protected;
},
/**
* Hide group cluster features which are not currently implemented.
*
* @returns {Boolean}
*/
disableGroupClusterFeatures() {
return this.model && this.model.cluster_type === CLUSTER_TYPE.GROUP;
},
/**
* Returns whether the environment can be stopped.
*
@ -581,7 +571,6 @@ export default {
<terminal-button-component
v-if="model && model.terminal_path"
:terminal-path="model.terminal_path"
:disabled="disableGroupClusterFeatures"
/>
<rollback-component

5
changelogs/unreleased/55487-enable-group-terminals-button.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Enable terminals button for group clusters
merge_request: 30255
author:
type: added

40
spec/javascripts/environments/environment_terminal_button_spec.js
View file

@ -12,36 +12,24 @@ describe('Stop Component', () => {
}).$mount();
};
describe('enabled', () => {
beforeEach(() => {
mountWithProps({ terminalPath });
});
beforeEach(() => {
mountWithProps({ terminalPath });
});
describe('computed', () => {
it('title', () => {
expect(component.title).toEqual('Terminal');
});
});
it('should render a link to open a web terminal with the provided path', () => {
expect(component.$el.tagName).toEqual('A');
expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
expect(component.$el.getAttribute('href')).toEqual(terminalPath);
});
it('should render a non-disabled button', () => {
expect(component.$el.classList).not.toContain('disabled');
describe('computed', () => {
it('title', () => {
expect(component.title).toEqual('Terminal');
});
});
describe('disabled', () => {
beforeEach(() => {
mountWithProps({ terminalPath, disabled: true });
});
it('should render a link to open a web terminal with the provided path', () => {
expect(component.$el.tagName).toEqual('A');
expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
expect(component.$el.getAttribute('href')).toEqual(terminalPath);
});
it('should render a disabled button', () => {
expect(component.$el.classList).toContain('disabled');
});
it('should render a non-disabled button', () => {
expect(component.$el.classList).not.toContain('disabled');
});
});