Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-22 20:45:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix more task specs

Browse source
This commit is contained in:
Juan Tejada 2016-01-22 16:55:29 -08:00
parent 877dd6ebde
commit 84ef0e97bf
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spec/tasks/change-folder-task-spec.coffee
View file

@ -35,9 +35,9 @@ describe "ChangeFolderTask", ->
"f3": new Folder({name: null, id: 'f3', displayName: "My Folder"})
testThreads = @testThreads =
't1': new Thread(id: 't1', folders: [@testFolders['f1']])
't2': new Thread(id: 't2', folders: _.values(@testFolders))
't3': new Thread(id: 't3', folders: [@testFolders['f2'], @testFolders['f3']])
't1': new Thread(id: 't1', categories: [@testFolders['f1']])
't2': new Thread(id: 't2', categories: _.values(@testFolders))
't3': new Thread(id: 't3', categories: [@testFolders['f2'], @testFolders['f3']])
testMessages = @testMessages =
'm1': new Message(id: 'm1', folder: @testFolders['f1'])

10
spec/tasks/change-labels-task-spec.coffee
View file

@ -32,9 +32,9 @@ describe "ChangeLabelsTask", ->
"l3": new Label({name: null, id: 'l3', displayName: "My Label"})
testThreads = @testThreads =
't1': new Thread(id: 't1', labels: [@testLabels['l1']])
't2': new Thread(id: 't2', labels: _.values(@testLabels))
't3': new Thread(id: 't3', labels: [@testLabels['l2'], @testLabels['l3']])
't1': new Thread(id: 't1', categories: [@testLabels['l1']])
't2': new Thread(id: 't2', categories: _.values(@testLabels))
't3': new Thread(id: 't3', categories: [@testLabels['l2'], @testLabels['l3']])
@basicThreadTask = new ChangeLabelsTask
labelsToAdd: ["l1", "l2"]
@ -153,7 +153,7 @@ describe "ChangeLabelsTask", ->
expect(out).toEqual(labels: [testLabels['l1']])
it 'should return an == array of labels when no changes have occurred', ->
thread = new Thread(id: '1', labels: [testLabels['l2'], testLabels['l3'], testLabels['l1']])
thread = new Thread(id: '1', categories: [testLabels['l2'], testLabels['l3'], testLabels['l1']])
task = new ChangeLabelsTask
labelsToAdd: [testLabels['l3'], testLabels['l1'], testLabels['l2']]
labelsToRemove: []
@ -161,7 +161,7 @@ describe "ChangeLabelsTask", ->
expect(_.isEqual(thread.labels, out.labels)).toBe(true)
it 'should not modify the input thread in any way', ->
thread = new Thread(id: '1', labels: [testLabels['l2'], testLabels['l1']])
thread = new Thread(id: '1', categories: [testLabels['l2'], testLabels['l1']])
task = new ChangeLabelsTask
labelsToAdd: []
labelsToRemove: [testLabels['l2']]

2
src/flux/attributes/attribute.coffee
View file

@ -31,7 +31,7 @@ class Attribute
if val.length is 0
console.warn "Attribute::in (#{@modelKey}) called with an empty set. You should avoid this useless query!"
if val.length is 1
return new Matcher(@, '=', val)
return new Matcher(@, '=', val[0])
new Matcher(@, 'in', val)
# Public: Returns a {Matcher} for objects `!=` to the provided value.

4
src/flux/tasks/change-folder-task.coffee
View file

@ -30,7 +30,9 @@ class ChangeFolderTask extends ChangeMailTask
"Moving to folder…"
description: ->
folderText = " to #{@folder.displayName}"
folderText = ""
if @folder instanceof Category
folderText = " to #{@folder.displayName}"
if @threads.length > 0
if @threads.length > 1