Move left pane entirely to React
This commit is contained in:
Scott Nonnenberg
parent
bf904ddd12
commit
b3ac1373fa
142 changed files with 5016 additions and 3428 deletions
|
|
@ -1,59 +0,0 @@
|
|||
/* global assert, storage, Whisper */
|
||||
|
||||
'use strict';
|
||||
|
||||
describe('AttachmentView', () => {
|
||||
let convo;
|
||||
|
||||
before(async () => {
|
||||
await clearDatabase();
|
||||
|
||||
convo = new Whisper.Conversation({ id: 'foo' });
|
||||
convo.messageCollection.add({
|
||||
conversationId: convo.id,
|
||||
body: 'hello world',
|
||||
type: 'outgoing',
|
||||
source: '+14158675309',
|
||||
received_at: Date.now(),
|
||||
});
|
||||
|
||||
await storage.put('number_id', '+18088888888.1');
|
||||
});
|
||||
|
||||
describe('with arbitrary files', () => {
|
||||
it('should render a file view', () => {
|
||||
const attachment = {
|
||||
contentType: 'unused',
|
||||
size: 1232,
|
||||
};
|
||||
const view = new Whisper.AttachmentView({ model: attachment }).render();
|
||||
assert.match(view.el.innerHTML, /fileView/);
|
||||
});
|
||||
it('should display the filename if present', () => {
|
||||
const attachment = {
|
||||
fileName: 'foo.txt',
|
||||
contentType: 'unused',
|
||||
size: 1232,
|
||||
};
|
||||
const view = new Whisper.AttachmentView({ model: attachment }).render();
|
||||
assert.match(view.el.innerHTML, /foo.txt/);
|
||||
});
|
||||
it('should render a file size', () => {
|
||||
const attachment = {
|
||||
size: 1232,
|
||||
contentType: 'unused',
|
||||
};
|
||||
const view = new Whisper.AttachmentView({ model: attachment }).render();
|
||||
assert.match(view.el.innerHTML, /1.2 KB/);
|
||||
});
|
||||
});
|
||||
it('should render an image for images', () => {
|
||||
const now = new Date().getTime();
|
||||
const attachment = { contentType: 'image/png', data: 'grumpy cat' };
|
||||
const view = new Whisper.AttachmentView({
|
||||
model: attachment,
|
||||
timestamp: now,
|
||||
}).render();
|
||||
assert.equal(view.el.firstChild.tagName, 'IMG');
|
||||
});
|
||||
});
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
/* global $, Whisper */
|
||||
|
||||
describe('ConversationSearchView', () => {
|
||||
it('should match partial numbers', () => {
|
||||
const $el = $('<div><div class="new-contact contact hide"></div></div>');
|
||||
const view = new Whisper.ConversationSearchView({
|
||||
el: $el,
|
||||
input: $('<input>'),
|
||||
}).render();
|
||||
const maybeNumbers = [
|
||||
'+1 415',
|
||||
'+1415',
|
||||
'+1415',
|
||||
'415',
|
||||
'(415)',
|
||||
' (415',
|
||||
'(415) 123 4567',
|
||||
'+1 (415) 123 4567',
|
||||
' +1 (415) 123 4567',
|
||||
'1 (415) 123 4567',
|
||||
'1 415-123-4567',
|
||||
'415-123-4567',
|
||||
];
|
||||
maybeNumbers.forEach(n => {
|
||||
assert.ok(view.maybeNumber(n), n);
|
||||
});
|
||||
});
|
||||
describe('Searching for left groups', () => {
|
||||
let convo;
|
||||
|
||||
before(() => {
|
||||
convo = new Whisper.ConversationCollection().add({
|
||||
id: '1-search-view',
|
||||
name: 'i left this group',
|
||||
members: [],
|
||||
type: 'group',
|
||||
left: true,
|
||||
});
|
||||
|
||||
return window.Signal.Data.saveConversation(convo.attributes, {
|
||||
Conversation: Whisper.Conversation,
|
||||
});
|
||||
});
|
||||
describe('with no messages', () => {
|
||||
let input;
|
||||
let view;
|
||||
|
||||
before(done => {
|
||||
input = $('<input>');
|
||||
view = new Whisper.ConversationSearchView({ input }).render();
|
||||
view.$input.val('left');
|
||||
view.filterContacts();
|
||||
view.typeahead_view.collection.on('reset', () => {
|
||||
done();
|
||||
});
|
||||
});
|
||||
it('should not surface left groups with no messages', () => {
|
||||
assert.isUndefined(
|
||||
view.typeahead_view.collection.get(convo.id),
|
||||
'got left group'
|
||||
);
|
||||
});
|
||||
});
|
||||
describe('with messages', () => {
|
||||
let input;
|
||||
let view;
|
||||
before(async () => {
|
||||
input = $('<input>');
|
||||
view = new Whisper.ConversationSearchView({ input }).render();
|
||||
convo.set({ id: '2-search-view', left: false });
|
||||
|
||||
await window.Signal.Data.saveConversation(convo.attributes, {
|
||||
Conversation: Whisper.Conversation,
|
||||
});
|
||||
|
||||
view.$input.val('left');
|
||||
view.filterContacts();
|
||||
|
||||
return new Promise(resolve => {
|
||||
view.typeahead_view.collection.on('reset', resolve);
|
||||
});
|
||||
});
|
||||
it('should surface left groups with messages', () => {
|
||||
assert.isDefined(
|
||||
view.typeahead_view.collection.get(convo.id),
|
||||
'got left group'
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -7,6 +7,11 @@ describe('InboxView', () => {
|
|||
before(async () => {
|
||||
ConversationController.reset();
|
||||
await ConversationController.load();
|
||||
await textsecure.storage.user.setNumberAndDeviceId(
|
||||
'18005554444',
|
||||
1,
|
||||
'Home Office'
|
||||
);
|
||||
await ConversationController.getOrCreateAndWait(
|
||||
textsecure.storage.user.getNumber(),
|
||||
'private'
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
/* global Whisper */
|
||||
|
||||
describe('Threads', () => {
|
||||
it('should be ordered newest to oldest', () => {
|
||||
// Timestamps
|
||||
const today = new Date();
|
||||
const tomorrow = new Date();
|
||||
tomorrow.setDate(today.getDate() + 1);
|
||||
|
||||
// Add threads
|
||||
Whisper.Threads.add({ timestamp: today });
|
||||
Whisper.Threads.add({ timestamp: tomorrow });
|
||||
|
||||
const { models } = Whisper.Threads;
|
||||
const firstTimestamp = models[0].get('timestamp').getTime();
|
||||
const secondTimestamp = models[1].get('timestamp').getTime();
|
||||
|
||||
// Compare timestamps
|
||||
assert(firstTimestamp > secondTimestamp);
|
||||
});
|
||||
});
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
/* global moment, Whisper */
|
||||
|
||||
'use strict';
|
||||
|
||||
describe('TimestampView', () => {
|
||||
it('formats long-ago timestamps correctly', () => {
|
||||
const timestamp = Date.now();
|
||||
const briefView = new Whisper.TimestampView({ brief: true }).render();
|
||||
const extendedView = new Whisper.ExtendedTimestampView().render();
|
||||
|
||||
// Helper functions to check absolute and relative timestamps
|
||||
|
||||
// Helper to check an absolute TS for an exact match
|
||||
const check = (view, ts, expected) => {
|
||||
const result = view.getRelativeTimeSpanString(ts);
|
||||
assert.strictEqual(result, expected);
|
||||
};
|
||||
|
||||
// Helper to check relative times for an exact match against both views
|
||||
const checkDiff = (secAgo, expectedBrief, expectedExtended) => {
|
||||
check(briefView, timestamp - secAgo * 1000, expectedBrief);
|
||||
check(extendedView, timestamp - secAgo * 1000, expectedExtended);
|
||||
};
|
||||
|
||||
// Helper to check an absolute TS for an exact match against both views
|
||||
const checkAbs = (ts, expectedBrief, expectedExtended) => {
|
||||
if (!expectedExtended) {
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
expectedExtended = expectedBrief;
|
||||
}
|
||||
check(briefView, ts, expectedBrief);
|
||||
check(extendedView, ts, expectedExtended);
|
||||
};
|
||||
|
||||
// Helper to check an absolute TS for a match at the beginning against
|
||||
const checkStartsWith = (view, ts, expected) => {
|
||||
const result = view.getRelativeTimeSpanString(ts);
|
||||
const regexp = new RegExp(`^${expected}`);
|
||||
assert.match(result, regexp);
|
||||
};
|
||||
|
||||
// check integer timestamp, JS Date object and moment object
|
||||
checkAbs(timestamp, 'now', 'now');
|
||||
checkAbs(new Date(), 'now', 'now');
|
||||
checkAbs(moment(), 'now', 'now');
|
||||
|
||||
// check recent timestamps
|
||||
checkDiff(30, 'now', 'now'); // 30 seconds
|
||||
checkDiff(40 * 60, '40 minutes', '40 minutes ago');
|
||||
checkDiff(60 * 60, '1 hour', '1 hour ago');
|
||||
checkDiff(125 * 60, '2 hours', '2 hours ago');
|
||||
|
||||
// set to third of month to avoid problems on the 29th/30th/31st
|
||||
const lastMonth = moment()
|
||||
.subtract(1, 'month')
|
||||
.date(3);
|
||||
const months = [
|
||||
'Jan',
|
||||
'Feb',
|
||||
'Mar',
|
||||
'Apr',
|
||||
'May',
|
||||
'Jun',
|
||||
'Jul',
|
||||
'Aug',
|
||||
'Sep',
|
||||
'Oct',
|
||||
'Nov',
|
||||
'Dec',
|
||||
];
|
||||
check(briefView, lastMonth, `${months[lastMonth.month()]} 3`);
|
||||
checkStartsWith(extendedView, lastMonth, `${months[lastMonth.month()]} 3`);
|
||||
|
||||
// subtract 26 hours to be safe in case of DST stuff
|
||||
const yesterday = new Date(timestamp - 26 * 60 * 60 * 1000);
|
||||
const daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
|
||||
check(briefView, yesterday, daysOfWeek[yesterday.getDay()]);
|
||||
checkStartsWith(extendedView, yesterday, daysOfWeek[yesterday.getDay()]);
|
||||
|
||||
// Check something long ago
|
||||
// months are zero-indexed in JS for some reason
|
||||
check(briefView, new Date(2012, 4, 5, 17, 30, 0), 'May 5, 2012');
|
||||
checkStartsWith(
|
||||
extendedView,
|
||||
new Date(2012, 4, 5, 17, 30, 0),
|
||||
'May 5, 2012'
|
||||
);
|
||||
});
|
||||
|
||||
describe('updates within a minute reasonable intervals', () => {
|
||||
let view;
|
||||
beforeEach(() => {
|
||||
view = new Whisper.TimestampView();
|
||||
});
|
||||
afterEach(() => {
|
||||
clearTimeout(view.timeout);
|
||||
});
|
||||
|
||||
it('updates timestamps this minute within a minute', () => {
|
||||
const now = Date.now();
|
||||
view.$el.attr('data-timestamp', now - 1000);
|
||||
view.update();
|
||||
assert.isAbove(view.delay, 0); // non zero
|
||||
assert.isBelow(view.delay, 60 * 1000); // < minute
|
||||
});
|
||||
|
||||
it('updates timestamps from this hour within a minute', () => {
|
||||
const now = Date.now();
|
||||
view.$el.attr('data-timestamp', now - 1000 - 1000 * 60 * 5); // 5 minutes and 1 sec ago
|
||||
view.update();
|
||||
assert.isAbove(view.delay, 0); // non zero
|
||||
assert.isBelow(view.delay, 60 * 1000); // minute
|
||||
});
|
||||
|
||||
it('updates timestamps from today within an hour', () => {
|
||||
const now = Date.now();
|
||||
view.$el.attr('data-timestamp', now - 1000 - 1000 * 60 * 60 * 5); // 5 hours and 1 sec ago
|
||||
view.update();
|
||||
assert.isAbove(view.delay, 60 * 1000); // minute
|
||||
assert.isBelow(view.delay, 60 * 60 * 1000); // hour
|
||||
});
|
||||
|
||||
it('updates timestamps from this week within a day', () => {
|
||||
const now = Date.now();
|
||||
view.$el.attr('data-timestamp', now - 1000 - 6 * 24 * 60 * 60 * 1000); // 6 days and 1 sec ago
|
||||
view.update();
|
||||
assert.isAbove(view.delay, 60 * 60 * 1000); // hour
|
||||
assert.isBelow(view.delay, 36 * 60 * 60 * 1000); // day and a half
|
||||
});
|
||||
|
||||
it('does not updates very old timestamps', () => {
|
||||
const now = Date.now();
|
||||
// return falsey value for long ago dates that don't update
|
||||
view.$el.attr('data-timestamp', now - 8 * 24 * 60 * 60 * 1000);
|
||||
view.update();
|
||||
assert.notOk(view.delay);
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue