mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-11-12 04:25:31 +08:00
2e1056f49e
Summary: Adds several new features to the templates plugin, fixes some existing bugs, and refactors existing code. New Plugin Features/Fixes: - Changes the templates editor in preferences to allow variables to be entered with `{{brackets}}`. Handles many contenteditable complexities to implement. - Better interaction for renaming and deleting of templates in the editor. - Changes tabbing behavior when using templates. Tabbing between variables now wraps around, and typing tab from outside a variable region highlights the closest region. - Prevents "Enter" key in the composer when inside a variable region, and strips all formatting/tags from within the region - this prevents major contenteditable issues that can result in inline CSS in the style of our variable regions, which will not be removed when sending. - Shows a warning when choosing a template if it will replace existing text in a draft. - Prevents invalid characters in template names (due to filenames, esp. on Windows), and shows an error message. Strips these characters from draft titles when making a template. - Fixes a bug where TemplateStore's initialization code was being called multiple times. New N1 code: - Several new methods in `DOMUtils` useful for working with contenteditable. - Implement some missing methods in `Editor` Refactor: - Major refactor/rewrite of template composer extension to use new DOMUtils methods and simplify the logic (while adding new functionality). Remaining issues: - `preferences-tempaltes.cjsx` and `template-editor.coffee` should be rewritten in ES6 for consistency - Need tests for new DOMUtils functions and for new Templates plugin code. Test Plan: manual, need to update specs Reviewers: evan, bengotow Reviewed By: evan, bengotow Subscribers: juan Differential Revision: https://phab.nylas.com/D2382
177 lines
6.3 KiB
JavaScript
177 lines
6.3 KiB
JavaScript
import fs from 'fs';
|
|
import shell from 'shell';
|
|
import {Message, DraftStore} from 'nylas-exports';
|
|
import TemplateStore from '../lib/template-store';
|
|
|
|
const stubTemplatesDir = '~/.nylas/templates';
|
|
|
|
const stubTemplateFiles = {
|
|
'template1.html': '<p>bla1</p>',
|
|
'template2.html': '<p>bla2</p>',
|
|
};
|
|
|
|
const stubTemplates = [
|
|
{id: 'template1.html', name: 'template1', path: `${stubTemplatesDir}/template1.html`},
|
|
{id: 'template2.html', name: 'template2', path: `${stubTemplatesDir}/template2.html`},
|
|
];
|
|
|
|
describe('TemplateStore', ()=> {
|
|
beforeEach(()=> {
|
|
spyOn(fs, 'mkdir');
|
|
spyOn(shell, 'showItemInFolder').andCallFake(()=> {});
|
|
spyOn(fs, 'writeFile').andCallFake((path, contents, callback)=> {
|
|
callback(null);
|
|
});
|
|
spyOn(fs, 'readFile').andCallFake((path, callback)=> {
|
|
const filename = path.split('/').pop();
|
|
callback(null, stubTemplateFiles[filename]);
|
|
});
|
|
});
|
|
|
|
it('should create the templates folder if it does not exist', ()=> {
|
|
spyOn(fs, 'exists').andCallFake((path, callback)=> callback(false) );
|
|
TemplateStore._init(stubTemplatesDir);
|
|
expect(fs.mkdir).toHaveBeenCalled();
|
|
});
|
|
|
|
it('should expose templates in the templates directory', ()=> {
|
|
let watchCallback;
|
|
spyOn(fs, 'exists').andCallFake((path, callback)=> { callback(true); });
|
|
spyOn(fs, 'watch').andCallFake((path, callback)=> watchCallback = callback);
|
|
spyOn(fs, 'readdir').andCallFake((path, callback)=> { callback(null, Object.keys(stubTemplateFiles)); });
|
|
TemplateStore._init(stubTemplatesDir);
|
|
watchCallback();
|
|
expect(TemplateStore.items()).toEqual(stubTemplates);
|
|
});
|
|
|
|
it('should watch the templates directory and reflect changes', ()=> {
|
|
let watchCallback = null;
|
|
let watchFired = false;
|
|
|
|
spyOn(fs, 'exists').andCallFake((path, callback)=> callback(true));
|
|
spyOn(fs, 'watch').andCallFake((path, callback)=> watchCallback = callback);
|
|
spyOn(fs, 'readdir').andCallFake((path, callback)=> {
|
|
if (watchFired) {
|
|
callback(null, Object.keys(stubTemplateFiles));
|
|
} else {
|
|
callback(null, []);
|
|
}
|
|
});
|
|
TemplateStore._init(stubTemplatesDir);
|
|
expect(TemplateStore.items()).toEqual([]);
|
|
|
|
watchFired = true;
|
|
watchCallback();
|
|
expect(TemplateStore.items()).toEqual(stubTemplates);
|
|
});
|
|
|
|
describe('insertTemplateId', ()=> {
|
|
it('should insert the template with the given id into the draft with the given id', ()=> {
|
|
let watchCallback;
|
|
spyOn(fs, 'exists').andCallFake((path, callback)=> { callback(true); });
|
|
spyOn(fs, 'watch').andCallFake((path, callback)=> watchCallback = callback);
|
|
spyOn(fs, 'readdir').andCallFake((path, callback)=> { callback(null, Object.keys(stubTemplateFiles)); });
|
|
TemplateStore._init(stubTemplatesDir);
|
|
watchCallback();
|
|
const add = jasmine.createSpy('add');
|
|
spyOn(DraftStore, 'sessionForClientId').andCallFake(()=> {
|
|
return Promise.resolve({changes: {add}});
|
|
});
|
|
|
|
runs(()=> {
|
|
TemplateStore._onInsertTemplateId({
|
|
templateId: 'template1.html',
|
|
draftClientId: 'localid-draft',
|
|
});
|
|
});
|
|
waitsFor(()=> add.calls.length > 0);
|
|
runs(()=> {
|
|
expect(add).toHaveBeenCalledWith({
|
|
body: stubTemplateFiles['template1.html'],
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('onCreateTemplate', ()=> {
|
|
beforeEach(()=> {
|
|
let d;
|
|
spyOn(DraftStore, 'sessionForClientId').andCallFake((draftClientId)=> {
|
|
if (draftClientId === 'localid-nosubject') {
|
|
d = new Message({subject: '', body: '<p>Body</p>'});
|
|
} else {
|
|
d = new Message({subject: 'Subject', body: '<p>Body</p>'});
|
|
}
|
|
const session = {draft() { return d; }};
|
|
return Promise.resolve(session);
|
|
});
|
|
TemplateStore._init(stubTemplatesDir);
|
|
});
|
|
|
|
it('should create a template with the given name and contents', ()=> {
|
|
const ref = TemplateStore.items();
|
|
TemplateStore._onCreateTemplate({name: '123', contents: 'bla'});
|
|
const item = (ref != null ? ref[0] : undefined);
|
|
expect(item.id).toBe('123.html');
|
|
expect(item.name).toBe('123');
|
|
expect(item.path.split('/').pop()).toBe('123.html');
|
|
});
|
|
|
|
it('should display an error if no name is provided', ()=> {
|
|
spyOn(TemplateStore, '_displayError');
|
|
TemplateStore._onCreateTemplate({contents: 'bla'});
|
|
expect(TemplateStore._displayError).toHaveBeenCalled();
|
|
});
|
|
|
|
it('should display an error if no content is provided', ()=> {
|
|
spyOn(TemplateStore, '_displayError');
|
|
TemplateStore._onCreateTemplate({name: 'bla'});
|
|
expect(TemplateStore._displayError).toHaveBeenCalled();
|
|
});
|
|
|
|
it('should save the template file to the templates folder', ()=> {
|
|
TemplateStore._onCreateTemplate({name: '123', contents: 'bla'});
|
|
const path = `${stubTemplatesDir}/123.html`;
|
|
expect(fs.writeFile).toHaveBeenCalled();
|
|
expect(fs.writeFile.mostRecentCall.args[0]).toEqual(path);
|
|
expect(fs.writeFile.mostRecentCall.args[1]).toEqual('bla');
|
|
});
|
|
|
|
it('should open the template so you can see it', ()=> {
|
|
TemplateStore._onCreateTemplate({name: '123', contents: 'bla'});
|
|
expect(shell.showItemInFolder).toHaveBeenCalled();
|
|
});
|
|
|
|
describe('when given a draft id', ()=> {
|
|
it('should create a template from the name and contents of the given draft', ()=> {
|
|
spyOn(TemplateStore, 'trigger');
|
|
spyOn(TemplateStore, '_populate');
|
|
runs(()=> {
|
|
TemplateStore._onCreateTemplate({draftClientId: 'localid-b'});
|
|
});
|
|
waitsFor(()=> TemplateStore.trigger.callCount > 0 );
|
|
runs(()=> {
|
|
expect(TemplateStore.items().length).toEqual(1);
|
|
});
|
|
});
|
|
|
|
it('should display an error if the draft has no subject', ()=> {
|
|
spyOn(TemplateStore, '_displayError');
|
|
runs(()=> {
|
|
TemplateStore._onCreateTemplate({draftClientId: 'localid-nosubject'});
|
|
});
|
|
waitsFor(()=> TemplateStore._displayError.callCount > 0 );
|
|
runs(()=> {
|
|
expect(TemplateStore._displayError).toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('onShowTemplates', ()=> {
|
|
it('should open the templates folder in the Finder', ()=> {
|
|
TemplateStore._onShowTemplates();
|
|
expect(shell.showItemInFolder).toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|