Skip to content

Commit b5627d5

Browse files
return rxjs to devextreme-angular
1 parent 7df84e7 commit b5627d5

File tree

4 files changed

+5279
-7203
lines changed

4 files changed

+5279
-7203
lines changed

packages/devextreme-angular/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"karma-webpack": "5.0.1",
6363
"ng-packagr": "19.2.2",
6464
"puppeteer": "23.6.1",
65+
"rxjs": "7.8.2",
6566
"reflect-metadata": "0.1.13",
6667
"stream-browserify": "3.0.0",
6768
"style-loader": "3.3.4",

packages/devextreme-angular/tests/src/http/ajax-bootstrap-interceptors.spec.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { TestBed } from '@angular/core/testing';
2-
import { Observable } from '@angular/core/rxjs-interop';
32
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
43
import {
54
provideHttpClient,
@@ -12,6 +11,7 @@ import { bootstrapApplication } from '@angular/platform-browser';
1211
import { DxHttpModule } from 'devextreme-angular/http';
1312
import DataSource from 'devextreme/data/data_source';
1413
import ODataStore from 'devextreme/data/odata/store';
14+
import { throwError } from 'rxjs';
1515

1616
const TEST_URL = '';
1717
const interceptors: Record<string, () => void> = {};
@@ -20,13 +20,10 @@ interceptors.interceptorFn = () => {};
2020

2121
const testInterceptorFn: HttpInterceptorFn = () => {
2222
interceptors.interceptorFn();
23-
24-
return new Observable(observer => {
25-
observer.error({
26-
status: 403,
27-
statusText: 'Request intercepted. Access Denied',
28-
});
29-
});
23+
return throwError(() => ({
24+
status: 403,
25+
statusText: 'Request intercepted. Access Denied',
26+
}));
3027
};
3128

3229
@Component({

packages/devextreme-angular/tests/src/http/ajax.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import DataSource from 'devextreme/data/data_source';
1111
import ODataStore from 'devextreme/data/odata/store';
1212
import ajax from 'devextreme/core/utils/ajax';
1313
import { DxFileUploaderComponent, DxFileUploaderModule } from 'devextreme-angular';
14+
import { Observable } from 'rxjs';
1415
import createSpy = jasmine.createSpy;
1516
import RemoteFileSystemProvider from 'devextreme/file_management/remote_provider';
1617
import FileSystemItem from 'devextreme/file_management/file_system_item';
@@ -23,7 +24,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
2324

2425
@Injectable()
2526
export class TestInterceptor implements HttpInterceptor {
26-
intercept(req: HttpRequest<any>, next: HttpHandler) {
27+
intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
2728
interceptors.interceptorFn();
2829
return next.handle(req);
2930
}

0 commit comments

Comments
 (0)