fix(build): Fix failing linter and account tests

This commit is contained in:
Ben Gotow 2016-03-18 13:26:03 -07:00
parent 31706d8890
commit 073924ff00
2 changed files with 7 additions and 12 deletions

View file

@ -1,6 +1,5 @@
import React, {Component, PropTypes} from 'react'; import React, {Component, PropTypes} from 'react';
import {RetinaImg, Flexbox, EditableList} from 'nylas-component-kit'; import {RetinaImg, Flexbox, EditableList} from 'nylas-component-kit';
import {Account} from 'nylas-exports';
import classnames from 'classnames'; import classnames from 'classnames';
class PreferencesAccountList extends Component { class PreferencesAccountList extends Component {

View file

@ -1,5 +1,6 @@
import React, {addons} from 'react/addons'; import React, {addons} from 'react/addons';
import PreferencesAccountDetails from '../lib/tabs/preferences-account-details'; import PreferencesAccountDetails from '../lib/tabs/preferences-account-details';
import {Account} from 'nylas-exports';
const {TestUtils: {renderIntoDocument}} = addons; const {TestUtils: {renderIntoDocument}} = addons;
@ -7,13 +8,14 @@ const makeComponent = (props = {})=> {
return renderIntoDocument(<PreferencesAccountDetails {...props} />); return renderIntoDocument(<PreferencesAccountDetails {...props} />);
}; };
const account = { const account = new Account({
id: 1, id: 1,
clientId: 1,
name: 'someone', name: 'someone',
emailAddress: 'someone@nylas.com', emailAddress: 'someone@nylas.com',
aliases: [], aliases: [],
defaultAlias: null, defaultAlias: null,
} })
describe('PreferencesAccountDetails', ()=> { describe('PreferencesAccountDetails', ()=> {
beforeEach(()=> { beforeEach(()=> {
@ -24,15 +26,9 @@ describe('PreferencesAccountDetails', ()=> {
}) })
function assertAccountState(actual, expected) { function assertAccountState(actual, expected) {
expect(actual).toEqual({ for (const key of Object.keys(expected)) {
account: { expect(actual.account[key]).toEqual(expected[key]);
id: expected.id || 1, }
name: expected.name || 'someone',
emailAddress: expected.emailAddress || 'someone@nylas.com',
aliases: expected.aliases || [],
defaultAlias: expected.defaultAlias || null,
},
})
} }
describe('_makeAlias', ()=> { describe('_makeAlias', ()=> {