Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update "RxJS" and "jasmine-marbles" version #1549

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ jobs:
name: coverage
path: coverage/


e2etests:
name: Run E2E Tests
runs-on: ubuntu-latest
Expand Down
111 changes: 29 additions & 82 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ngx-json-viewer": "^3",
"ngx-linky": "^4.0.0",
"ngx-material-luxon": "^1.1.1",
"rxjs": "^6.6.6",
"rxjs": "^7.4.0",
"shortid": "^2.2.16",
"socket.io-client": "^4.7.2",
"tslib": "^2.4.0",
Expand Down Expand Up @@ -82,7 +82,7 @@
"eslint-plugin-prettier": "^5.0.0",
"jasmine": "^5.0.0",
"jasmine-core": "^5.0.0",
"jasmine-marbles": "^0.6.0",
"jasmine-marbles": "^0.9.0",
"jasmine-spec-reporter": "^7.0.0",
"karma": "~6.4.2",
"karma-chrome-launcher": "~3.2.0",
Expand Down
6 changes: 3 additions & 3 deletions src/app/shared/sdk/models/FireLoopRef.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { merge, Observable, Subject } from "rxjs";
import { merge, Observable, Subject, throwError } from "rxjs";
import { catchError } from "rxjs/operators";
import { LoopBackFilter, StatFilter } from "./index";
import { SocketConnection } from "../sockets/socket.connections";
Expand Down Expand Up @@ -331,15 +331,15 @@ export class FireLoopRef<T> {
}
});
if (event.match("dispose")) {
setTimeout(() => subject.next());
setTimeout(() => subject.next(null));
}
// This event listener will be wiped within socket.connections
this.socket.sharedObservables.sharedOnDisconnect.subscribe(() =>
subject.complete(),
);
return subject
.asObservable()
.pipe(catchError((error: any) => Observable.throw(error)));
.pipe(catchError((error: any) => throwError(() => new Error(error))));
}
/**
* @method buildId
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/sdk/sockets/socket.connections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class SocketConnection {
// Listen for authentication
this.on("authenticated", () => {
this.authenticated = true;
this.subjects.onAuthenticated.next();
this.subjects.onAuthenticated.next("authenticated");
this.heartbeater();
});
// Listen for authentication
Expand Down
2 changes: 1 addition & 1 deletion src/app/state-management/effects/user.effects.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ describe("UserEffects", () => {

actions = hot("-a", { a: action });

expect(effects.logoutNavigate$).toBeObservable(actions);
expect(effects.logoutNavigate$).toBeObservable(actions as any);
expect(router.navigate).toHaveBeenCalledTimes(1);
expect(router.navigate).toHaveBeenCalledWith(["/login"]);
});
Expand Down
Loading