Commit ca012d44 authored by JC Brand's avatar JC Brand

Update to newer Skeletor.js

`.forEach` on a Collection no longer returns the models, so need to
update some tests.
parent 9b9f9a94
...@@ -21104,8 +21104,8 @@ ...@@ -21104,8 +21104,8 @@
"dev": true "dev": true
}, },
"skeletor.js": { "skeletor.js": {
"version": "github:skeletorjs/skeletor#dea2d5791ee894493e30b92662c953efec0e58f6", "version": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"from": "github:skeletorjs/skeletor#dea2d5791ee894493e30b92662c953efec0e58f6", "from": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"requires": { "requires": {
"lodash": "^4.17.14" "lodash": "^4.17.14"
} }
......
...@@ -586,7 +586,7 @@ ...@@ -586,7 +586,7 @@
await test_utils.openControlBox(_converse); await test_utils.openControlBox(_converse);
await test_utils.waitForRoster(_converse, 'all'); await test_utils.waitForRoster(_converse, 'all');
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
await u.waitUntil(() => sizzle('.roster-group', _converse.rosterview.el).filter(u.isVisible).map(e => e.querySelector('li')).length, 1000); await u.waitUntil(() => sizzle('.roster-group', _converse.rosterview.el).filter(u.isVisible).map(e => e.querySelector('li')).length, 1000);
await checkHeaderToggling.apply( await checkHeaderToggling.apply(
_converse, _converse,
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
spyOn(_converse.rosterview, 'update').and.callThrough(); spyOn(_converse.rosterview, 'update').and.callThrough();
await test_utils.openControlBox(_converse); await test_utils.openControlBox(_converse);
await test_utils.waitForRoster(_converse, 'pending'); await test_utils.waitForRoster(_converse, 'pending');
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
await u.waitUntil(() => sizzle('li', _converse.rosterview.el).filter(u.isVisible).length, 500) await u.waitUntil(() => sizzle('li', _converse.rosterview.el).filter(u.isVisible).length, 500)
expect(_converse.rosterview.update).toHaveBeenCalled(); expect(_converse.rosterview.update).toHaveBeenCalled();
expect(u.isVisible(_converse.rosterview.el)).toBe(true); expect(u.isVisible(_converse.rosterview.el)).toBe(true);
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
async function (done, _converse) { async function (done, _converse) {
await test_utils.waitForRoster(_converse, 'all'); await test_utils.waitForRoster(_converse, 'all');
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
const name = mock.pend_names[0]; const name = mock.pend_names[0];
const jid = name.replace(/ /g,'.').toLowerCase() + '@montague.lit'; const jid = name.replace(/ /g,'.').toLowerCase() + '@montague.lit';
const contact = _converse.roster.get(jid); const contact = _converse.roster.get(jid);
...@@ -705,7 +705,7 @@ ...@@ -705,7 +705,7 @@
async function (done, _converse) { async function (done, _converse) {
await test_utils.waitForRoster(_converse, 'all'); await test_utils.waitForRoster(_converse, 'all');
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
await u.waitUntil(() => _converse.roster.at(0).vcard.get('fullname')) await u.waitUntil(() => _converse.roster.at(0).vcard.get('fullname'))
spyOn(window, 'confirm').and.returnValue(true); spyOn(window, 'confirm').and.returnValue(true);
for (var i=0; i<mock.pend_names.length; i++) { for (var i=0; i<mock.pend_names.length; i++) {
...@@ -723,7 +723,7 @@ ...@@ -723,7 +723,7 @@
await test_utils.openControlBox(_converse); await test_utils.openControlBox(_converse);
await test_utils.waitForRoster(_converse, 'current'); await test_utils.waitForRoster(_converse, 'current');
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
spyOn(_converse.rosterview, 'update').and.callThrough(); spyOn(_converse.rosterview, 'update').and.callThrough();
let i; let i;
for (i=0; i<mock.pend_names.length; i++) { for (i=0; i<mock.pend_names.length; i++) {
...@@ -749,7 +749,7 @@ ...@@ -749,7 +749,7 @@
async function _addContacts (_converse) { async function _addContacts (_converse) {
await test_utils.waitForRoster(_converse, 'current'); await test_utils.waitForRoster(_converse, 'current');
await test_utils.openControlBox(_converse); await test_utils.openControlBox(_converse);
await Promise.all(_converse.roster.forEach(contact => u.waitUntil(() => contact.vcard.get('fullname')))); await Promise.all(_converse.roster.map(contact => u.waitUntil(() => contact.vcard.get('fullname'))));
} }
it("can be collapsed under their own header", it("can be collapsed under their own header",
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
}, },
"gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2", "gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
"devDependencies": { "devDependencies": {
"skeletor.js": "skeletorjs/skeletor#dea2d5791ee894493e30b92662c953efec0e58f6", "skeletor.js": "skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"filesize": "^4.1.2", "filesize": "^4.1.2",
"jed": "1.1.1", "jed": "1.1.1",
"localforage": "^1.7.3", "localforage": "^1.7.3",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment