Revert "Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master'"

This reverts merge request !28620
This commit is contained in:
Winnie Hellmann 2019-05-28 09:57:46 +00:00 committed by Kushal Pandya
parent 7400146741
commit b9ee324a00
2 changed files with 1 additions and 21 deletions

View file

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

View file

@ -2,9 +2,6 @@ import { shallowMount } from '@vue/test-utils';
import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui'; import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui';
import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue'; import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue';
import { TEST_HOST } from 'helpers/test_constants'; import { TEST_HOST } from 'helpers/test_constants';
import initSettingsPanels from '~/settings_panels';
jest.mock('~/settings_panels');
describe('operation settings external dashboard component', () => { describe('operation settings external dashboard component', () => {
let wrapper; let wrapper;
@ -24,18 +21,6 @@ describe('operation settings external dashboard component', () => {
expect(wrapper.find('.js-section-header').text()).toBe('External Dashboard'); 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', () => { describe('sub-header', () => {
let subHeader; let subHeader;