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

Merge branch 'revert-daa72ac8' into 'master' 

Revert "Add expand/collapse button to operation settings"

See merge request gitlab-org/gitlab-ce!28818
This commit is contained in:
Kushal Pandya 2019-05-28 09:57:47 +00:00
parent 7400146741 b9ee324a00
commit 35dfe85f2d
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/operation_settings/components/external_dashboard.vue
View File

@ -1,6 +1,5 @@
<script>
import { GlButton, GlFormGroup, GlFormInput, GlLink } from '@gitlab/ui';
import initSettingsPanels from '~/settings_panels';
export default {
components: {
@ -20,19 +19,15 @@ export default {
required: true,
},
},
mounted() {
initSettingsPanels();
},
};
</script>
<template>
<section class="settings no-animate">
<section class="settings expanded">
<div class="settings-header">
<h4 class="js-section-header">
{{ s__('ExternalMetrics|External Dashboard') }}
</h4>
<gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
<p class="js-section-sub-header">
{{
s__(

15
spec/frontend/operation_settings/components/external_dashboard_spec.js
View File

@ -2,9 +2,6 @@ import { shallowMount } from '@vue/test-utils';
import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui';
import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue';
import { TEST_HOST } from 'helpers/test_constants';
import initSettingsPanels from '~/settings_panels';
jest.mock('~/settings_panels');
describe('operation settings external dashboard component', () => {
let wrapper;
@ -24,18 +21,6 @@ describe('operation settings external dashboard component', () => {
expect(wrapper.find('.js-section-header').text()).toBe('External Dashboard');
});
describe('expand/collapse button', () => {
it('is properly instantiated as a settings panel', () => {
expect(initSettingsPanels).toHaveBeenCalled();
});
it('defaults to collapsed state', () => {
const button = wrapper.find(GlButton);
expect(button.text()).toBe('Expand');
});
});
describe('sub-header', () => {
let subHeader;