Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-25 00:25:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix double fromJSON issue

Browse source
This commit is contained in:
Ben Gotow 2017-06-24 12:16:05 -07:00
parent 0bec5719fd
commit f37aa13780
2 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
packages/client-app/spec/models/thread-spec.coffee
View file

@ -20,38 +20,6 @@ describe 'Thread', ->
iterations += 1
console.log((Date.now() - start) / 1000.0 + "ms per 1000")
describe "inAllMail", ->
describe "when the thread categoriesType is 'folders'", ->
it "should return true", ->
thread = new Thread(categoriesType: 'folders', categories: [new Category(name: 'inbox')])
expect(thread.inAllMail).toBe(true)
# Unlike Gmail, this means half the thread is in trash and half is in sent.
# It should still appear in results for "Sent"
thread = new Thread(categoriesType: 'folders', categories: [new Category(name: 'sent'), new Category(name: 'trash')])
expect(thread.inAllMail).toBe(true)
describe "when the thread categoriesType is 'labels'", ->
it "should return true if the thread has an all category", ->
thread = new Thread(categoriesType: 'labels', categories: [new Category(name: 'all')])
expect(thread.inAllMail).toBe(true)
# thread is half in spam
thread = new Thread(categoriesType: 'labels', categories: [new Category(name: 'all'), new Category(name: 'inbox'), new Category(name: 'spam')])
expect(thread.inAllMail).toBe(true)
it "should return false if the thread has the spam category and no all mail", ->
thread = new Thread(categoriesType: 'labels', categories: [new Category(name: 'sent'), new Category(name: 'spam')])
expect(thread.inAllMail).toBe(false)
it "should return false if the thread has the trash category and no all mail", ->
thread = new Thread(categoriesType: 'labels', categories: [new Category(name: 'sent'), new Category(name: 'trash')])
expect(thread.inAllMail).toBe(false)
it "should return true if the thread has none of the above (assume all mail)", ->
thread = new Thread(categoriesType: 'labels', categories: [new Category(name: 'inbox')])
expect(thread.inAllMail).toBe(true)
describe 'sortedCategories', ->
sortedForCategoryNames = (inputs) ->
categories = _.map inputs, (i) ->

3
packages/client-app/src/flux/models/query.es6
View file

@ -296,8 +296,7 @@ export default class ModelQuery {
try {
return result.map((row) => {
const json = JSON.parse(row.data, Utils.registeredObjectReviver)
const object = (new this._klass()).fromJSON(json);
const object = JSON.parse(row.data, Utils.registeredObjectReviver)
for (const attrName of Object.keys(this._klass.attributes)) {
const attr = this._klass.attributes[attrName];
if (!attr.needsColumn() || !attr.loadFromColumn) {