mirror of
https://github.com/oxen-io/session-desktop.git
synced 2023-12-14 02:12:57 +01:00
Improve fixtures, restore InboxView rendering on the test page (#1562)
This commit is contained in:
parent
151d1797db
commit
61a2a1a8f8
|
@ -154,6 +154,10 @@
|
||||||
loadPromise: function() {
|
loadPromise: function() {
|
||||||
return this._initialPromise;
|
return this._initialPromise;
|
||||||
},
|
},
|
||||||
|
reset: function() {
|
||||||
|
this._initialPromise = null;
|
||||||
|
conversations.reset([]);
|
||||||
|
},
|
||||||
load: function() {
|
load: function() {
|
||||||
console.log('ConversationController: starting initial fetch');
|
console.log('ConversationController: starting initial fetch');
|
||||||
if (this._initialPromise) {
|
if (this._initialPromise) {
|
||||||
|
|
|
@ -50,6 +50,39 @@ Whisper.Fixtures = (function() {
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
var Vera = conversationCollection.get(VERA_ID);
|
||||||
|
Vera.messageCollection.add([
|
||||||
|
{
|
||||||
|
conversationId: VERA_ID,
|
||||||
|
type: 'incoming',
|
||||||
|
sent_at: now - 10000000,
|
||||||
|
received_at: now - 10000000,
|
||||||
|
body: "My piece for Iskra is ready!",
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
|
var Nestor = conversationCollection.get(NESTOR_ID);
|
||||||
|
Nestor.messageCollection.add([
|
||||||
|
{
|
||||||
|
conversationId: NESTOR_ID,
|
||||||
|
type: 'incoming',
|
||||||
|
sent_at: now - 1000000000,
|
||||||
|
received_at: now - 1000000000,
|
||||||
|
body: "Need a ride?",
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
|
var Fred = conversationCollection.get(FRED_ID);
|
||||||
|
Fred.messageCollection.add([
|
||||||
|
{
|
||||||
|
conversationId: FRED_ID,
|
||||||
|
type: 'incoming',
|
||||||
|
sent_at: now - 500000000,
|
||||||
|
received_at: now - 500000000,
|
||||||
|
body: "It is my ambition to say in ten sentences what everyone else says in a whole book — what everyone else does not say in a whole book.",
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
var Michel = conversationCollection.get(MICHEL_ID);
|
var Michel = conversationCollection.get(MICHEL_ID);
|
||||||
Michel.messageCollection.add([
|
Michel.messageCollection.add([
|
||||||
{
|
{
|
||||||
|
@ -115,6 +148,7 @@ Whisper.Fixtures = (function() {
|
||||||
body : m.body,
|
body : m.body,
|
||||||
sent_at : m.date,
|
sent_at : m.date,
|
||||||
received_at : m.date,
|
received_at : m.date,
|
||||||
|
timestamp : m.date,
|
||||||
attachments : m.attachments,
|
attachments : m.attachments,
|
||||||
unread : m.unread,
|
unread : m.unread,
|
||||||
source : m.source,
|
source : m.source,
|
||||||
|
@ -127,29 +161,30 @@ Whisper.Fixtures = (function() {
|
||||||
active_at: now - 100000,
|
active_at: now - 100000,
|
||||||
timestamp: now - 100000,
|
timestamp: now - 100000,
|
||||||
id: 'group1',
|
id: 'group1',
|
||||||
lastMessage: "See you all there!"
|
lastMessage: "See you all there!",
|
||||||
|
members: [MICHEL_ID, FRED_ID, NESTOR_ID],
|
||||||
});
|
});
|
||||||
group.messageCollection.add([
|
group.messageCollection.add([
|
||||||
{
|
{
|
||||||
date: now - 30000,
|
date: now - 60 * 1000 * 30,
|
||||||
type: 'incoming',
|
type: 'incoming',
|
||||||
body: "If you knew when you began a book what you would say at the end, do you think that you would have the courage to write it?",
|
body: "If you knew when you began a book what you would say at the end, do you think that you would have the courage to write it?",
|
||||||
source: MICHEL_ID,
|
source: MICHEL_ID,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
date: now - 20000,
|
date: now - 60 * 1000 * 20,
|
||||||
type: 'incoming',
|
type: 'incoming',
|
||||||
body: "A book which has a strange knack of seeking out its fellow-revellers and enticing them on to new secret paths and dancing-places.",
|
body: "A book which has a strange knack of seeking out its fellow-revellers and enticing them on to new secret paths and dancing-places.",
|
||||||
source: FRED_ID
|
source: FRED_ID
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
date: now - 4000,
|
date: now - 60 * 1000 * 4,
|
||||||
type: 'incoming',
|
type: 'incoming',
|
||||||
body: "Let's meet in the library.",
|
body: "Let's meet in the library.",
|
||||||
source: NESTOR_ID
|
source: NESTOR_ID
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
date: now - 1000,
|
date: now - 60 * 1000,
|
||||||
type: 'incoming',
|
type: 'incoming',
|
||||||
body: "I'll be a little late.",
|
body: "I'll be a little late.",
|
||||||
source: NESTOR_ID
|
source: NESTOR_ID
|
||||||
|
@ -157,19 +192,18 @@ Whisper.Fixtures = (function() {
|
||||||
{
|
{
|
||||||
date: now,
|
date: now,
|
||||||
type: 'outgoing',
|
type: 'outgoing',
|
||||||
body: "See you all there!"
|
body: "See you all there!",
|
||||||
|
recipients: [MICHEL_ID, FRED_ID, NESTOR_ID],
|
||||||
|
delivered_to: [MICHEL_ID, FRED_ID],
|
||||||
|
sent_to: [NESTOR_ID],
|
||||||
},
|
},
|
||||||
].map(function(m) {
|
].map(function(m) {
|
||||||
return {
|
return Object.assign({}, m, {
|
||||||
conversationId : group.id,
|
conversationId : group.id,
|
||||||
source : m.source,
|
|
||||||
type : m.type,
|
|
||||||
body : m.body,
|
|
||||||
sent_at : m.date,
|
sent_at : m.date,
|
||||||
received_at : m.date,
|
received_at : m.date,
|
||||||
attachments : m.attachments,
|
timestamp : m.date,
|
||||||
unread : m.unread
|
});
|
||||||
};
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
function dataURItoBlob(dataURI) {
|
function dataURItoBlob(dataURI) {
|
||||||
|
@ -2651,3 +2685,4 @@ Whisper.Fixtures = (function() {
|
||||||
|
|
||||||
return conversationCollection;
|
return conversationCollection;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,8 @@ describe("Fixtures", function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('renders', function(done) {
|
it('renders', function(done) {
|
||||||
ConversationController.loadPromise().then(function() {
|
ConversationController.reset();
|
||||||
|
ConversationController.load().then(function() {
|
||||||
var view = new Whisper.InboxView({window: window});
|
var view = new Whisper.InboxView({window: window});
|
||||||
view.onEmpty();
|
view.onEmpty();
|
||||||
view.$el.prependTo($('#render-android'));
|
view.$el.prependTo($('#render-android'));
|
||||||
|
|
|
@ -593,6 +593,7 @@
|
||||||
<script type="text/javascript" src="../js/keychange_listener.js" data-cover></script>
|
<script type="text/javascript" src="../js/keychange_listener.js" data-cover></script>
|
||||||
<script type='text/javascript' src='../js/expiring_messages.js' data-cover></script>
|
<script type='text/javascript' src='../js/expiring_messages.js' data-cover></script>
|
||||||
<script type='text/javascript' src='../js/notifications.js' data-cover></script>
|
<script type='text/javascript' src='../js/notifications.js' data-cover></script>
|
||||||
|
<script type='text/javascript' src='../js/focus_listener.js'></script>
|
||||||
|
|
||||||
<script type="text/javascript" src="../js/chromium.js" data-cover></script>
|
<script type="text/javascript" src="../js/chromium.js" data-cover></script>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue