Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-28 19:38:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into toger5/maximised_widgets_release

Browse Source
This commit is contained in:
Timo K 2022-01-11 14:00:00 +01:00
commit 07e2531d0f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/fetch-develop.deps.sh
View File

@ -25,7 +25,8 @@ function clone() {
if [ -n "$branch" ] if [ -n "$branch" ]
then then
echo "Trying to use $org/$repo#$branch" echo "Trying to use $org/$repo#$branch"
git clone https://github.com/$org/$repo.git $repo --branch $branch \ # Disable auth prompts: https://serverfault.com/a/665959
GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch $branch \
"${GIT_CLONE_ARGS[@]}" "${GIT_CLONE_ARGS[@]}"
return $? return $?
fi fi

1
test/app-tests/joining-test.tsx
View File

@ -77,6 +77,7 @@ describe('joining a room', function() {
const ROOM_ALIAS = '#alias:localhost'; const ROOM_ALIAS = '#alias:localhost';
const ROOM_ID = '!id:localhost'; const ROOM_ID = '!id:localhost';
httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' }); httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });

4
test/app-tests/loading-test.tsx
View File

@ -313,6 +313,7 @@ describe('loading:', function() {
}); });
it('shows the last known room by default', function() { it('shows the last known room by default', function() {
httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
loadApp(); loadApp();
@ -332,6 +333,7 @@ describe('loading:', function() {
it('shows a home page by default if we have no joined rooms', function() { it('shows a home page by default if we have no joined rooms', function() {
localStorage.removeItem("mx_last_room_id"); localStorage.removeItem("mx_last_room_id");
httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
loadApp(); loadApp();
@ -349,6 +351,7 @@ describe('loading:', function() {
}); });
it('shows a room view if we followed a room link', function() { it('shows a room view if we followed a room link', function() {
httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
loadApp({ loadApp({
@ -663,6 +666,7 @@ describe('loading:', function() {
// Wait for another trip around the event loop for the UI to update // Wait for another trip around the event loop for the UI to update
return sleep(1); return sleep(1);
}).then(() => { }).then(() => {
httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
httpBackend.when('GET', '/pushrules').respond(200, {}); httpBackend.when('GET', '/pushrules').respond(200, {});
return expectAndAwaitSync().catch((e) => { return expectAndAwaitSync().catch((e) => {
throw new Error("Never got /sync after login: did the client start?"); throw new Error("Never got /sync after login: did the client start?");