summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-05-28 09:57:46 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-05-28 09:57:46 +0000
commitb9ee324a00afa66ef76f5223f627ac29e2e4b8b8 (patch)
tree9e16150ad0b0a412976834fc2f5fdcb36987c7c5
parent74001467411c138c32028b94b6967b421acafe76 (diff)
downloadgitlab-ce-b9ee324a00afa66ef76f5223f627ac29e2e4b8b8.tar.gz
Revert "Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master'"
This reverts merge request !28620
-rw-r--r--app/assets/javascripts/operation_settings/components/external_dashboard.vue7
-rw-r--r--spec/frontend/operation_settings/components/external_dashboard_spec.js15
2 files changed, 1 insertions, 21 deletions
diff --git a/app/assets/javascripts/operation_settings/components/external_dashboard.vue b/app/assets/javascripts/operation_settings/components/external_dashboard.vue
index b2b37355033..0a87d193b72 100644
--- a/app/assets/javascripts/operation_settings/components/external_dashboard.vue
+++ b/app/assets/javascripts/operation_settings/components/external_dashboard.vue
@@ -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__(
diff --git a/spec/frontend/operation_settings/components/external_dashboard_spec.js b/spec/frontend/operation_settings/components/external_dashboard_spec.js
index 4d35d35965c..de1dd219fe0 100644
--- a/spec/frontend/operation_settings/components/external_dashboard_spec.js
+++ b/spec/frontend/operation_settings/components/external_dashboard_spec.js
@@ -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;