From 22ee0e911fae0374fe5c470a6c328ee20725a5c5 Mon Sep 17 00:00:00 2001 From: Christopher Henn Date: Tue, 10 Jul 2018 15:21:22 -0700 Subject: [PATCH] Rename TemplateControlDropdown to TemplateControl --- .../{TemplateControlDropdown.tsx => TemplateControl.tsx} | 4 ++-- ui/src/tempVars/components/TemplateControlBar.tsx | 4 ++-- ...ateControlDropdown.test.tsx => TemplateControl.test.tsx} | 6 +++--- ui/test/tempVars/components/TemplateControlBar.test.tsx | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename ui/src/tempVars/components/{TemplateControlDropdown.tsx => TemplateControl.tsx} (96%) rename ui/test/tempVars/components/{TemplateControlDropdown.test.tsx => TemplateControl.test.tsx} (87%) diff --git a/ui/src/tempVars/components/TemplateControlDropdown.tsx b/ui/src/tempVars/components/TemplateControl.tsx similarity index 96% rename from ui/src/tempVars/components/TemplateControlDropdown.tsx rename to ui/src/tempVars/components/TemplateControl.tsx index ec8a1afd8..3843b4bde 100644 --- a/ui/src/tempVars/components/TemplateControlDropdown.tsx +++ b/ui/src/tempVars/components/TemplateControl.tsx @@ -24,7 +24,7 @@ interface State { isEditing: boolean } -class TemplateControlDropdown extends PureComponent { +class TemplateControl extends PureComponent { constructor(props) { super(props) @@ -115,4 +115,4 @@ class TemplateControlDropdown extends PureComponent { } } -export default TemplateControlDropdown +export default TemplateControl diff --git a/ui/src/tempVars/components/TemplateControlBar.tsx b/ui/src/tempVars/components/TemplateControlBar.tsx index 5c7053834..1702bd733 100644 --- a/ui/src/tempVars/components/TemplateControlBar.tsx +++ b/ui/src/tempVars/components/TemplateControlBar.tsx @@ -3,7 +3,7 @@ import classnames from 'classnames' import {ErrorHandling} from 'src/shared/decorators/errors' -import TemplateControlDropdown from 'src/tempVars/components/TemplateControlDropdown' +import TemplateControl from 'src/tempVars/components/TemplateControl' import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' import Authorized, {EDITOR_ROLE} from 'src/auth/Authorized' @@ -77,7 +77,7 @@ class TemplateControlBar extends Component { } return templates.map(template => ( - Promise.resolve(), } -describe('TemplateControlDropdown', () => { +describe('TemplateControl', () => { it('should show a TemplateVariableEditor overlay when the settings icon is clicked', () => { - const wrapper = shallow(, { + const wrapper = shallow(, { context: { store: {}, }, diff --git a/ui/test/tempVars/components/TemplateControlBar.test.tsx b/ui/test/tempVars/components/TemplateControlBar.test.tsx index 1205f5f31..d683eb5c6 100644 --- a/ui/test/tempVars/components/TemplateControlBar.test.tsx +++ b/ui/test/tempVars/components/TemplateControlBar.test.tsx @@ -2,7 +2,7 @@ import React from 'react' import {shallow} from 'enzyme' import TemplateControlBar from 'src/tempVars/components/TemplateControlBar' -import TemplateControlDropdown from 'src/tempVars/components/TemplateControlDropdown' +import TemplateControl from 'src/tempVars/components/TemplateControl' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import {source} from 'test/resources' @@ -45,7 +45,7 @@ describe('TemplateControlBar', () => { const props = {...defaultProps, templates: [template]} const wrapper = shallow() - const dropdown = wrapper.find(TemplateControlDropdown) + const dropdown = wrapper.find(TemplateControl) expect(dropdown.exists()).toBe(true) }) @@ -55,7 +55,7 @@ describe('TemplateControlBar', () => { const emptyState = wrapper.find({'data-test': 'empty-state'}) - const dropdown = wrapper.find(TemplateControlDropdown) + const dropdown = wrapper.find(TemplateControl) expect(dropdown.exists()).toBe(false) expect(emptyState.exists()).toBe(true)