fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
{$, $$} = require '../src/space-pen-extensions'
|
|
|
|
Exec = require('child_process').exec
|
|
|
|
path = require 'path'
|
|
|
|
Package = require '../src/package'
|
|
|
|
ThemeManager = require '../src/theme-manager'
|
|
|
|
|
|
|
|
describe "the `atom` global", ->
|
|
|
|
describe 'window sizing methods', ->
|
|
|
|
describe '::getPosition and ::setPosition', ->
|
|
|
|
it 'sets the position of the window, and can retrieve the position just set', ->
|
|
|
|
atom.setPosition(22, 45)
|
|
|
|
expect(atom.getPosition()).toEqual x: 22, y: 45
|
|
|
|
|
|
|
|
describe '::getSize and ::setSize', ->
|
|
|
|
originalSize = null
|
|
|
|
beforeEach ->
|
|
|
|
originalSize = atom.getSize()
|
|
|
|
afterEach ->
|
|
|
|
atom.setSize(originalSize.width, originalSize.height)
|
|
|
|
|
|
|
|
it 'sets the size of the window, and can retrieve the size just set', ->
|
|
|
|
atom.setSize(100, 400)
|
|
|
|
expect(atom.getSize()).toEqual width: 100, height: 400
|
|
|
|
|
2015-09-05 03:27:05 +08:00
|
|
|
describe '::setMinimumWidth', ->
|
|
|
|
win = atom.getCurrentWindow()
|
|
|
|
|
|
|
|
it "sets the minimum width", ->
|
|
|
|
inputMinWidth = 500
|
|
|
|
win.setMinimumSize(1000, 1000)
|
|
|
|
|
|
|
|
atom.setMinimumWidth(inputMinWidth)
|
|
|
|
|
|
|
|
[actualMinWidth, h] = win.getMinimumSize()
|
|
|
|
expect(actualMinWidth).toBe inputMinWidth
|
|
|
|
|
|
|
|
it "sets the current size if minWidth > current width", ->
|
|
|
|
inputMinWidth = 1000
|
|
|
|
win.setSize(500, 500)
|
|
|
|
|
|
|
|
atom.setMinimumWidth(inputMinWidth)
|
|
|
|
|
|
|
|
[actualWidth, h] = win.getMinimumSize()
|
|
|
|
expect(actualWidth).toBe inputMinWidth
|
|
|
|
|
2015-10-06 07:24:17 +08:00
|
|
|
describe '::getDefaultWindowDimensions', ->
|
|
|
|
screen = require('remote').require 'screen'
|
|
|
|
|
|
|
|
it "returns primary display's work area size if it's small enough", ->
|
|
|
|
spyOn(screen, 'getPrimaryDisplay').andReturn workAreaSize: width: 1440, height: 900
|
|
|
|
|
|
|
|
out = atom.getDefaultWindowDimensions()
|
|
|
|
expect(out).toEqual x: 0, y: 0, width: 1440, height: 900
|
|
|
|
|
|
|
|
it "caps width at 1440 and centers it, if wider", ->
|
|
|
|
spyOn(screen, 'getPrimaryDisplay').andReturn workAreaSize: width: 1840, height: 900
|
|
|
|
|
|
|
|
out = atom.getDefaultWindowDimensions()
|
|
|
|
expect(out).toEqual x: 200, y: 0, width: 1440, height: 900
|
|
|
|
|
|
|
|
it "caps height at 900 and centers it, if taller", ->
|
|
|
|
spyOn(screen, 'getPrimaryDisplay').andReturn workAreaSize: width: 1440, height: 1100
|
|
|
|
|
|
|
|
out = atom.getDefaultWindowDimensions()
|
|
|
|
expect(out).toEqual x: 0, y: 100, width: 1440, height: 900
|
|
|
|
|
|
|
|
it "returns only the max viewport size if it's smaller than the defaults", ->
|
|
|
|
spyOn(screen, 'getPrimaryDisplay').andReturn workAreaSize: width: 1000, height: 800
|
|
|
|
|
|
|
|
out = atom.getDefaultWindowDimensions()
|
|
|
|
expect(out).toEqual x: 0, y: 0, width: 1000, height: 800
|
|
|
|
|
2015-10-07 08:55:44 +08:00
|
|
|
it "always rounds X and Y", ->
|
|
|
|
spyOn(screen, 'getPrimaryDisplay').andReturn workAreaSize: width: 1845, height: 955
|
|
|
|
|
|
|
|
out = atom.getDefaultWindowDimensions()
|
|
|
|
expect(out).toEqual x: 202, y: 27, width: 1440, height: 900
|
|
|
|
|
2015-10-06 07:24:17 +08:00
|
|
|
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
describe ".isReleasedVersion()", ->
|
|
|
|
it "returns false if the version is a SHA and true otherwise", ->
|
|
|
|
version = '0.1.0'
|
|
|
|
spyOn(atom, 'getVersion').andCallFake -> version
|
|
|
|
expect(atom.isReleasedVersion()).toBe true
|
|
|
|
version = '36b5518'
|
|
|
|
expect(atom.isReleasedVersion()).toBe false
|
|
|
|
|
2015-09-05 03:27:05 +08:00
|
|
|
xdescribe "when an update becomes available", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
subscription = null
|
|
|
|
|
|
|
|
afterEach ->
|
|
|
|
subscription?.dispose()
|
|
|
|
|
|
|
|
it "invokes onUpdateAvailable listeners", ->
|
|
|
|
updateAvailableHandler = jasmine.createSpy("update-available-handler")
|
|
|
|
subscription = atom.onUpdateAvailable updateAvailableHandler
|
|
|
|
|
|
|
|
autoUpdater = require('remote').require('auto-updater')
|
|
|
|
autoUpdater.emit 'update-downloaded', null, "notes", "version"
|
|
|
|
|
|
|
|
waitsFor ->
|
|
|
|
updateAvailableHandler.callCount > 0
|
|
|
|
|
|
|
|
runs ->
|
|
|
|
{releaseVersion, releaseNotes} = updateAvailableHandler.mostRecentCall.args[0]
|
|
|
|
expect(releaseVersion).toBe 'version'
|
|
|
|
expect(releaseNotes).toBe 'notes'
|
|
|
|
|
2015-09-05 03:27:05 +08:00
|
|
|
xdescribe "loading default config", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
it 'loads the default core config', ->
|
|
|
|
expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
|
|
|
|
expect(atom.config.get('core.followSymlinks')).toBe false
|
|
|
|
expect(atom.config.get('editor.showInvisibles')).toBe false
|
|
|
|
|
2015-09-05 03:27:05 +08:00
|
|
|
xdescribe "window onerror handler", ->
|
fix(drafts): Various improvements and fixes to drafts, draft state management
Summary:
This diff contains a few major changes:
1. Scribe is no longer used for the text editor. It's just a plain contenteditable region. The toolbar items (bold, italic, underline) still work. Scribe was causing React inconcistency issues in the following scenario:
- View thread with draft, edit draft
- Move to another thread
- Move back to thread with draft
- Move to another thread. Notice that one or more messages from thread with draft are still there.
There may be a way to fix this, but I tried for hours and there are Github Issues open on it's repository asking for React compatibility, so it may be fixed soon. For now contenteditable is working great.
2. Action.saveDraft() is no longer debounced in the DraftStore. Instead, firing that action causes the save to happen immediately, and the DraftStoreProxy has a new "DraftChangeSet" class which is responsbile for batching saves as the user interacts with the ComposerView. There are a couple big wins here:
- In the future, we may want to be able to call Action.saveDraft() in other situations and it should behave like a normal action. We may also want to expose the DraftStoreProxy as an easy way of backing interactive draft UI.
- Previously, when you added a contact to To/CC/BCC, this happened:
<input> -> Action.saveDraft -> (delay!!) -> Database -> DraftStore -> DraftStoreProxy -> View Updates
Increasing the delay to something reasonable like 200msec meant there was 200msec of lag before you saw the new view state.
To fix this, I created a new class called DraftChangeSet which is responsible for accumulating changes as they're made and firing Action.saveDraft. "Adding" a change to the change set also causes the Draft provided by the DraftStoreProxy to change immediately (the changes are a temporary layer on top of the database object). This means no delay while changes are being applied. There's a better explanation in the source!
This diff includes a few minor fixes as well:
1. Draft.state is gone—use Message.object = draft instead
2. String model attributes should never be null
3. Pre-send checks that can cancel draft send
4. Put the entire curl history and task queue into feedback reports
5. Cache localIds for extra speed
6. Move us up to latest React
Test Plan: No new tests - once we lock down this new design I'll write tests for the DraftChangeSet
Reviewers: evan
Reviewed By: evan
Differential Revision: https://review.inboxapp.com/D1125
2015-02-04 08:24:31 +08:00
|
|
|
beforeEach ->
|
|
|
|
spyOn atom, 'openDevTools'
|
|
|
|
spyOn atom, 'executeJavaScriptInDevTools'
|
|
|
|
|
|
|
|
it "will open the dev tools when an error is triggered", ->
|
|
|
|
try
|
|
|
|
a + 1
|
|
|
|
catch e
|
|
|
|
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
|
|
|
|
|
|
|
|
expect(atom.openDevTools).toHaveBeenCalled()
|
|
|
|
expect(atom.executeJavaScriptInDevTools).toHaveBeenCalled()
|
|
|
|
|
|
|
|
describe "::onWillThrowError", ->
|
|
|
|
willThrowSpy = null
|
|
|
|
beforeEach ->
|
|
|
|
willThrowSpy = jasmine.createSpy()
|
|
|
|
|
|
|
|
it "is called when there is an error", ->
|
|
|
|
error = null
|
|
|
|
atom.onWillThrowError(willThrowSpy)
|
|
|
|
try
|
|
|
|
a + 1
|
|
|
|
catch e
|
|
|
|
error = e
|
|
|
|
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
|
|
|
|
|
|
|
|
delete willThrowSpy.mostRecentCall.args[0].preventDefault
|
|
|
|
expect(willThrowSpy).toHaveBeenCalledWith
|
|
|
|
message: error.toString()
|
|
|
|
url: 'abc'
|
|
|
|
line: 2
|
|
|
|
column: 3
|
|
|
|
originalError: error
|
|
|
|
|
|
|
|
it "will not show the devtools when preventDefault() is called", ->
|
|
|
|
willThrowSpy.andCallFake (errorObject) -> errorObject.preventDefault()
|
|
|
|
atom.onWillThrowError(willThrowSpy)
|
|
|
|
|
|
|
|
try
|
|
|
|
a + 1
|
|
|
|
catch e
|
|
|
|
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
|
|
|
|
|
|
|
|
expect(willThrowSpy).toHaveBeenCalled()
|
|
|
|
expect(atom.openDevTools).not.toHaveBeenCalled()
|
|
|
|
expect(atom.executeJavaScriptInDevTools).not.toHaveBeenCalled()
|
|
|
|
|
|
|
|
describe "::onDidThrowError", ->
|
|
|
|
didThrowSpy = null
|
|
|
|
beforeEach ->
|
|
|
|
didThrowSpy = jasmine.createSpy()
|
|
|
|
|
|
|
|
it "is called when there is an error", ->
|
|
|
|
error = null
|
|
|
|
atom.onDidThrowError(didThrowSpy)
|
|
|
|
try
|
|
|
|
a + 1
|
|
|
|
catch e
|
|
|
|
error = e
|
|
|
|
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
|
|
|
|
expect(didThrowSpy).toHaveBeenCalledWith
|
|
|
|
message: error.toString()
|
|
|
|
url: 'abc'
|
|
|
|
line: 2
|
|
|
|
column: 3
|
|
|
|
originalError: error
|