From 9dda5404a0cb797c989a28f35f310a01c3411877 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Fri, 21 Jun 2019 12:01:29 -0400 Subject: [PATCH] add 'has' prefix to error booleans --- src/App.jsx | 10 +++++----- src/screens/Job/JobList/JobList.jsx | 12 ++++++------ src/screens/Login/Login.jsx | 28 ++++++++++++++-------------- src/screens/Login/Login.test.jsx | 12 ++++++------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index afc27ff70a..1e1053d982 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -48,7 +48,7 @@ class App extends Component { version: null, isAboutModalOpen: false, isNavOpen, - configError: false, + hasConfigError: false, }; this.handleLogout = this.handleLogout.bind(this); @@ -81,7 +81,7 @@ class App extends Component { } handleConfigErrorClose () { - this.setState({ configError: false }); + this.setState({ hasConfigError: false }); } async loadConfig () { @@ -92,7 +92,7 @@ class App extends Component { this.setState({ ansible_version, custom_virtualenvs, version, me }); } catch (err) { - this.setState({ configError: true }); + this.setState({ hasConfigError: true }); } } @@ -104,7 +104,7 @@ class App extends Component { isNavOpen, me, version, - configError, + hasConfigError, } = this.state; const { i18n, @@ -170,7 +170,7 @@ class App extends Component { onClose={this.handleAboutClose} /> UnifiedJobsAPI.destroy(id))); } catch (err) { - this.setState({ deletionError: true }); + this.setState({ hasDeletionError: true }); } finally { await this.loadJobs(); } @@ -109,7 +109,7 @@ class JobList extends Component { const { hasContentError, hasContentLoading, - deletionError, + hasDeletionError, jobs, itemCount, selected, @@ -166,7 +166,7 @@ class JobList extends Component { /> ', () => { } = await findChildren(loginWrapper); expect(usernameInput.props().value).toBe(''); expect(passwordInput.props().value).toBe(''); - expect(awxLogin.state('validationError')).toBe(false); + expect(awxLogin.state('hasValidationError')).toBe(false); expect(submitButton.props().isDisabled).toBe(false); done(); }); @@ -126,14 +126,14 @@ describe('', () => { submitButton.simulate('click'); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('username') === 'invalid'); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('password') === 'invalid'); - await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('validationError') === true); + await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('hasValidationError') === true); await waitForElement(loginWrapper, formError, (el) => el.length === 1); usernameInput.props().onChange({ currentTarget: { value: 'dsarif' } }); passwordInput.props().onChange({ currentTarget: { value: 'freneticpny' } }); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('username') === 'dsarif'); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('password') === 'freneticpny'); - await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('validationError') === false); + await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('hasValidationError') === false); await waitForElement(loginWrapper, formError, (el) => el.length === 0); done(); @@ -151,16 +151,16 @@ describe('', () => { RootAPI.login.mockRejectedValueOnce({ response: { status: 500 } }); submitButton.simulate('click'); - await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('authenticationError') === true); + await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('hasAuthError') === true); usernameInput.props().onChange({ currentTarget: { value: 'sgrimes' } }); passwordInput.props().onChange({ currentTarget: { value: 'ovid' } }); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('username') === 'sgrimes'); await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('password') === 'ovid'); - await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('authenticationError') === true); + await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('hasAuthError') === true); submitButton.simulate('click'); - await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('authenticationError') === false); + await waitForElement(loginWrapper, 'AWXLogin', (el) => el.state('hasAuthError') === false); done(); });