feat(babel6): Yay all the tests pass

This commit is contained in:
Evan Morikawa 2016-05-05 16:22:44 -07:00
parent cc1f6e46dd
commit 1a0dfeaf78
2 changed files with 20 additions and 33 deletions

View file

@ -1,20 +1,15 @@
import _ from 'underscore';
import {Actions, NylasAPI, AccountStore, CategoryStore} from 'nylas-exports';
import {
moveThreadsToSnooze,
moveThreadsFromSnooze,
getSnoozeCategoriesByAccount,
} from './snooze-utils';
import SnoozeUtils from './snooze-utils'
import {PLUGIN_ID, PLUGIN_NAME} from './snooze-constants';
import SnoozeActions from './snooze-actions';
class SnoozeStore {
constructor(pluginId = PLUGIN_ID, pluginName = PLUGIN_NAME) {
this.pluginId = pluginId
this.pluginName = pluginName
this.snoozeCategoriesPromise = getSnoozeCategoriesByAccount(AccountStore.accounts())
this.snoozeCategoriesPromise = SnoozeUtils.getSnoozeCategoriesByAccount(AccountStore.accounts())
}
activate() {
@ -58,7 +53,7 @@ class SnoozeStore {
};
onAccountsChanged = ()=> {
this.snoozeCategoriesPromise = getSnoozeCategoriesByAccount(AccountStore.accounts())
this.snoozeCategoriesPromise = SnoozeUtils.getSnoozeCategoriesByAccount(AccountStore.accounts())
};
onSnoozeThreads = (threads, snoozeDate, label) => {
@ -70,7 +65,7 @@ class SnoozeStore {
})
return Promise.all(promises)
.then(()=> {
return moveThreadsToSnooze(threads, this.snoozeCategoriesPromise, snoozeDate)
return SnoozeUtils.moveThreadsToSnooze(threads, this.snoozeCategoriesPromise, snoozeDate)
})
.then((updatedThreads)=> {
return this.snoozeCategoriesPromise
@ -83,7 +78,7 @@ class SnoozeStore {
})
})
.catch((error)=> {
moveThreadsFromSnooze(threads, this.snoozeCategoriesPromise)
SnoozeUtils.moveThreadsFromSnooze(threads, this.snoozeCategoriesPromise)
Actions.closePopover();
NylasEnv.reportError(error);
NylasEnv.showErrorDialog(`Sorry, we were unable to save your snooze settings. ${error.message}`);

View file

@ -10,14 +10,6 @@ import {
} from 'nylas-exports'
import SnoozeUtils from '../lib/snooze-utils'
const {
snoozedUntilMessage,
createSnoozeCategory,
getSnoozeCategory,
moveThreads,
} = SnoozeUtils
describe('Snooze Utils', function snoozeUtils() {
beforeEach(()=> {
this.name = 'Snoozed Folder'
@ -27,21 +19,21 @@ describe('Snooze Utils', function snoozeUtils() {
describe('snoozedUntilMessage', ()=> {
it('returns correct message if no snooze date provided', ()=> {
expect(snoozedUntilMessage()).toEqual('Snoozed')
expect(SnoozeUtils.snoozedUntilMessage()).toEqual('Snoozed')
});
describe('when less than 24 hours from now', ()=> {
it('returns correct message if snoozeDate is on the hour of the clock', ()=> {
const now9AM = moment().hour(9).minute(0)
const tomorrowAt8 = moment(now9AM).add(1, 'day').hour(8)
const result = snoozedUntilMessage(tomorrowAt8, now9AM)
const result = SnoozeUtils.snoozedUntilMessage(tomorrowAt8, now9AM)
expect(result).toEqual('Snoozed until 8 AM')
});
it('returns correct message if snoozeDate otherwise', ()=> {
const now9AM = moment().hour(9).minute(0)
const snooze10AM = moment(now9AM).hour(10).minute(5)
const result = snoozedUntilMessage(snooze10AM, now9AM)
const result = SnoozeUtils.snoozedUntilMessage(snooze10AM, now9AM)
expect(result).toEqual('Snoozed until 10:05 AM')
});
});
@ -51,7 +43,7 @@ describe('Snooze Utils', function snoozeUtils() {
// Jan 1
const now9AM = moment().month(0).date(1).hour(9).minute(0)
const tomorrowAt10 = moment(now9AM).add(1, 'day').hour(10)
const result = snoozedUntilMessage(tomorrowAt10, now9AM)
const result = SnoozeUtils.snoozedUntilMessage(tomorrowAt10, now9AM)
expect(result).toEqual('Snoozed until Jan 2, 10 AM')
});
@ -59,7 +51,7 @@ describe('Snooze Utils', function snoozeUtils() {
// Jan 1
const now9AM = moment().month(0).date(1).hour(9).minute(0)
const tomorrowAt930 = moment(now9AM).add(1, 'day').minute(30)
const result = snoozedUntilMessage(tomorrowAt930, now9AM)
const result = SnoozeUtils.snoozedUntilMessage(tomorrowAt930, now9AM)
expect(result).toEqual('Snoozed until Jan 2, 9:30 AM')
});
});
@ -79,7 +71,7 @@ describe('Snooze Utils', function snoozeUtils() {
})
it('creates category with correct snooze name', ()=> {
createSnoozeCategory(this.accId, this.name)
SnoozeUtils.createSnoozeCategory(this.accId, this.name)
expect(Actions.queueTask).toHaveBeenCalled()
const task = Actions.queueTask.calls[0].args[0]
expect(task.category.displayName).toEqual(this.name)
@ -88,7 +80,7 @@ describe('Snooze Utils', function snoozeUtils() {
it('resolves with the updated category that has been saved to the server', ()=> {
waitsForPromise(()=> {
return createSnoozeCategory(this.accId, this.name).then((result)=> {
return SnoozeUtils.createSnoozeCategory(this.accId, this.name).then((result)=> {
expect(DatabaseStore.findBy).toHaveBeenCalled()
expect(result).toBe(this.category)
})
@ -100,9 +92,9 @@ describe('Snooze Utils', function snoozeUtils() {
jasmine.unspy(DatabaseStore, 'findBy')
spyOn(DatabaseStore, 'findBy').andReturn(Promise.resolve(this.category))
waitsForPromise(()=> {
return createSnoozeCategory(this.accId, this.name)
return SnoozeUtils.createSnoozeCategory(this.accId, this.name)
.then(()=> {
throw new Error('createSnoozeCategory should not resolve in this case!')
throw new Error('SnoozeUtils.createSnoozeCategory should not resolve in this case!')
})
.catch((error)=> {
expect(DatabaseStore.findBy).toHaveBeenCalled()
@ -115,9 +107,9 @@ describe('Snooze Utils', function snoozeUtils() {
jasmine.unspy(DatabaseStore, 'findBy')
spyOn(DatabaseStore, 'findBy').andReturn(Promise.resolve(undefined))
waitsForPromise(()=> {
return createSnoozeCategory(this.accId, this.name)
return SnoozeUtils.createSnoozeCategory(this.accId, this.name)
.then(()=> {
throw new Error('createSnoozeCategory should not resolve in this case!')
throw new Error('SnoozeUtils.createSnoozeCategory should not resolve in this case!')
})
.catch((error)=> {
expect(DatabaseStore.findBy).toHaveBeenCalled()
@ -137,7 +129,7 @@ describe('Snooze Utils', function snoozeUtils() {
spyOn(SnoozeUtils, 'createSnoozeCategory')
waitsForPromise(()=> {
return getSnoozeCategory(this.accountId, this.name)
return SnoozeUtils.getSnoozeCategory(this.accountId, this.name)
.then((result)=> {
expect(SnoozeUtils.createSnoozeCategory).not.toHaveBeenCalled()
expect(result).toBe(categories[1])
@ -154,7 +146,7 @@ describe('Snooze Utils', function snoozeUtils() {
spyOn(SnoozeUtils, 'createSnoozeCategory').andReturn(Promise.resolve(snoozeCat))
waitsForPromise(()=> {
return getSnoozeCategory(this.accId, this.name)
return SnoozeUtils.getSnoozeCategory(this.accId, this.name)
.then((result)=> {
expect(SnoozeUtils.createSnoozeCategory).toHaveBeenCalledWith(this.accId, this.name)
expect(result).toBe(snoozeCat)
@ -193,7 +185,7 @@ describe('Snooze Utils', function snoozeUtils() {
const description = this.description
waitsForPromise(()=> {
return moveThreads(this.threads, {snooze, description, getInboxCategory: this.getInboxCat, getSnoozeCategory: this.getSnoozeCat})
return SnoozeUtils.moveThreads(this.threads, {snooze, description, getInboxCategory: this.getInboxCat, getSnoozeCategory: this.getSnoozeCat})
.then(()=> {
expect(TaskFactory.tasksForApplyingCategories).toHaveBeenCalled()
expect(Actions.queueTasks).toHaveBeenCalled()
@ -213,7 +205,7 @@ describe('Snooze Utils', function snoozeUtils() {
const description = this.description
waitsForPromise(()=> {
return moveThreads(this.threads, {snooze, description, getInboxCategory: this.getInboxCat, getSnoozeCategory: this.getSnoozeCat})
return SnoozeUtils.moveThreads(this.threads, {snooze, description, getInboxCategory: this.getInboxCat, getSnoozeCategory: this.getSnoozeCat})
.then(()=> {
expect(TaskFactory.tasksForApplyingCategories).toHaveBeenCalled()
expect(Actions.queueTasks).toHaveBeenCalled()