tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

More tests.

pull/130/head
Sebastian Stehle 9 years ago
parent
5329d0f623
commit
8a4cb7c7fc
3 changed files with 428 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/Squidex/app/framework/angular/http-extensions-impl.ts
  2. 132
      src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts
  3. 266
      src/Squidex/app/shared/services/contents.service.spec.ts

84
src/Squidex/app/framework/angular/http-extensions-impl.ts
View File

@ -53,72 +53,48 @@ export class ErrorDto {
export module HTTP { export module HTTP {
export function getVersioned(http: HttpClient, url: string, version?: Version): Observable<any> { export function getVersioned(http: HttpClient, url: string, version?: Version): Observable<any> {
if (version) { const headers = createHeaders(version);
return http.get(url, { observe: 'response', headers: new HttpHeaders().set('If-Match', version.value) })
.do((response: HttpResponse<any>) => { return handleVersion(http.get(url, { observe: 'response', headers }), version);
if (version && response.status.toString().indexOf('2') === 0 && response.headers) {
const etag = response.headers.get('etag');
if (etag) {
version.update(etag);
}
}
}).map((response: HttpResponse<any>) => response.body);
} else {
return http.get(url, { observe: 'response' }).map((response: HttpResponse<any>) => response.body);
}
} }
export function postVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable<any> { export function postVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable<any> {
if (version) { const headers = createHeaders(version);
return http.post(url, body, { observe: 'response', headers: new HttpHeaders().set('If-Match', version.value) })
.do((response: HttpResponse<any>) => { return handleVersion(http.post(url, body, { observe: 'response', headers }), version);
if (version && response.status.toString().indexOf('2') === 0 && response.headers) {
const etag = response.headers.get('etag');
if (etag) {
version.update(etag);
}
}
}).map((response: HttpResponse<any>) => response.body);
} else {
return http.post(url, body, { observe: 'response' }).map((response: HttpResponse<any>) => response.body);
}
} }
export function putVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable<any> { export function putVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable<any> {
if (version) { const headers = createHeaders(version);
return http.put(url, body, { observe: 'response', headers: new HttpHeaders().set('If-Match', version.value) })
.do((response: HttpResponse<any>) => { return handleVersion(http.put(url, body, { observe: 'response', headers }), version);
if (version && response.status.toString().indexOf('2') === 0 && response.headers) {
const etag = response.headers.get('etag');
if (etag) {
version.update(etag);
}
}
}).map((response: HttpResponse<any>) => response.body);
} else {
return http.put(url, body, { observe: 'response' }).map((response: HttpResponse<any>) => response.body);
}
} }
export function deleteVersioned(http: HttpClient, url: string, version?: Version): Observable<any> { export function deleteVersioned(http: HttpClient, url: string, version?: Version): Observable<any> {
if (version) { const headers = createHeaders(version);
return http.delete(url, { observe: 'response', headers: new HttpHeaders().set('If-Match', version.value) })
.do((response: HttpResponse<any>) => { return handleVersion(http.delete(url, { observe: 'response', headers }), version);
if (version && response.status.toString().indexOf('2') === 0 && response.headers) { }
const etag = response.headers.get('etag');
function createHeaders(version?: Version): HttpHeaders {
if (etag) { if (version && version.value && version.value.length > 0) {
version.update(etag); return new HttpHeaders().set('If-Match', version.value);
}
}
}).map((response: HttpResponse<any>) => response.body);
} else { } else {
return http.delete(url, { observe: 'response' }).map((response: HttpResponse<any>) => response.body); return new HttpHeaders();
} }
} }
function handleVersion(httpRequest: Observable<HttpResponse<any>>, version: Version): Observable<any> {
return httpRequest.do((response: HttpResponse<any>) => {
if (version && response.status.toString().indexOf('2') === 0 && response.headers) {
const etag = response.headers.get('etag');
if (etag) {
version.update(etag);
}
}
}).map((response: HttpResponse<any>) => response.body);
}
} }
export function pretifyError(message: string): Observable<any> { export function pretifyError(message: string): Observable<any> {

132
src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts
View File

@ -0,0 +1,132 @@
/*
* Squidex Headless CMS
*
* @license
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { HttpClient, HttpHeaders, HTTP_INTERCEPTORS } from '@angular/common/http';
import { inject, TestBed } from '@angular/core/testing';
import { IMock, Mock, Times } from 'typemoq';
import {
ApiUrlConfig,
AuthService,
AuthInterceptor
} from './../';
describe('AppClientsService', () => {
let authService: IMock<AuthService> = null;
beforeEach(() => {
authService = Mock.ofType(AuthService);
authService.setup(x => x.user).returns(() => { return <any>{ authToken: 'letmein' }; });
TestBed.configureTestingModule({
imports: [
HttpClientTestingModule
],
providers: [
{ provide: AuthService, useValue: authService.object },
{ provide: ApiUrlConfig, useValue: new ApiUrlConfig('http://service/p/') },
{
provide: HTTP_INTERCEPTORS,
useClass: AuthInterceptor,
multi: true
}
]
});
});
afterEach(inject([HttpTestingController], (httpMock: HttpTestingController) => {
httpMock.verify();
}));
it('should append headers to request',
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
http.get('http://service/p/apps').subscribe();
const req = httpMock.expectOne('http://service/p/apps');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('Authorization')).toEqual('letmein');
expect(req.request.headers.get('Accept-Language')).toEqual('*');
expect(req.request.headers.get('Pragma')).toEqual('no-cache');
}));
it('should not append headers for no auth headers',
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
http.get('http://service/p/apps', { headers: new HttpHeaders().set('NoAuth', '') }).subscribe();
const req = httpMock.expectOne('http://service/p/apps');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('Authorization')).toBeNull();
expect(req.request.headers.get('Accept-Language')).toBeNull();
expect(req.request.headers.get('Pragma')).toBeNull();
}));
it('should not append headers for other requests',
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
http.get('http://cloud/p/apps').subscribe();
const req = httpMock.expectOne('http://cloud/p/apps');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('Authorization')).toBeNull();
expect(req.request.headers.get('Accept-Language')).toBeNull();
expect(req.request.headers.get('Pragma')).toBeNull();
}));
it(`should logout for 404 status code when user is expired.`,
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
authService.setup(x => x.user).returns(() => { return <any>{ authToken: 'letmein', isExpired: true }; });
http.get('http://service/p/apps').subscribe(
_ => { /* NOOP */ },
_ => { /* NOOP */ });
const req = httpMock.expectOne('http://service/p/apps');
req.error(<any>{}, { status: 404 });
authService.verify(x => x.logoutRedirect(), Times.once());
}));
[401, 403].forEach(statusCode => {
it(`should logout for ${statusCode} status code`,
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
http.get('http://service/p/apps').subscribe(
_ => { /* NOOP */ },
_ => { /* NOOP */ });
const req = httpMock.expectOne('http://service/p/apps');
req.error(<any>{}, { status: statusCode });
authService.verify(x => x.logoutRedirect(), Times.once());
}));
});
[500, 404, 405].forEach(statusCode => {
it(`should not logout for ${statusCode} status code`,
inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => {
http.get('http://service/p/apps').subscribe(
_ => { /* NOOP */ },
_ => { /* NOOP */ });
const req = httpMock.expectOne('http://service/p/apps');
req.error(<any>{}, { status: statusCode });
authService.verify(x => x.logoutRedirect(), Times.never());
}));
});
});

266
src/Squidex/app/shared/services/contents.service.spec.ts
View File

@ -0,0 +1,266 @@
/*
* Squidex Headless CMS
*
* @license
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { inject, TestBed } from '@angular/core/testing';
import {
ApiUrlConfig,
ContentDto,
ContentsDto,
ContentsService,
DateTime,
Version
} from './../';
describe('ContentsService', () => {
let version = new Version('1');
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
HttpClientTestingModule
],
providers: [
ContentsService,
{ provide: ApiUrlConfig, useValue: new ApiUrlConfig('http://service/p/') }
]
});
});
afterEach(inject([HttpTestingController], (httpMock: HttpTestingController) => {
httpMock.verify();
}));
it('should make get request to get contents',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
let contents: ContentsDto | null = null;
contentsService.getContents('my-app', 'my-schema', 17, 13).subscribe(result => {
contents = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$top=17&$skip=13');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('If-Match')).toBeNull();
req.flush({
total: 10,
items: [
{
id: 'id1',
isPublished: true,
created: '2016-12-12T10:10',
createdBy: 'Created1',
lastModified: '2017-12-12T10:10',
lastModifiedBy: 'LastModifiedBy1',
version: 11,
data: {}
},
{
id: 'id2',
isPublished: true,
created: '2016-10-12T10:10',
createdBy: 'Created2',
lastModified: '2017-10-12T10:10',
lastModifiedBy: 'LastModifiedBy2',
version: 22,
data: {}
}
]
});
expect(contents).toEqual(
new ContentsDto(10, [
new ContentDto('id1', true, 'Created1', 'LastModifiedBy1',
DateTime.parseISO_UTC('2016-12-12T10:10'),
DateTime.parseISO_UTC('2017-12-12T10:10'),
{},
new Version('11')),
new ContentDto('id2', true, 'Created2', 'LastModifiedBy2',
DateTime.parseISO_UTC('2016-10-12T10:10'),
DateTime.parseISO_UTC('2017-10-12T10:10'),
{},
new Version('22'))
]));
}));
it('should append query to get request as search',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
let contents: ContentsDto | null = null;
contentsService.getContents('my-app', 'my-schema', 17, 13, 'my-query').subscribe(result => {
contents = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$search="my-query"&$top=17&$skip=13');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('If-Match')).toBeNull();
req.flush({ total: 10, items: [] });
}));
it('should append ids to get request with ids',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
let contents: ContentsDto | null = null;
contentsService.getContents('my-app', 'my-schema', 17, 13, null, ['id1', 'id2']).subscribe(result => {
contents = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$top=17&$skip=13&ids=id1,id2');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('If-Match')).toBeNull();
req.flush({ total: 10, items: [] });
}));
it('should append query to get request as plain query string',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
let contents: ContentsDto | null = null;
contentsService.getContents('my-app', 'my-schema', 17, 13, '$filter=my-filter').subscribe(result => {
contents = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema?nonPublished=true&hidden=true&$filter=my-filter&$top=17&$skip=13');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('If-Match')).toBeNull();
req.flush({ total: 10, items: [] });
}));
it('should make get request to get content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
let content: ContentDto | null = null;
contentsService.getContent('my-app', 'my-schema', 'content1', version).subscribe(result => {
content = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1?hidden=true');
expect(req.request.method).toEqual('GET');
expect(req.request.headers.get('If-Match')).toBe(version.value);
req.flush({
id: 'id1',
isPublished: true,
created: '2016-12-12T10:10',
createdBy: 'Created1',
lastModified: '2017-12-12T10:10',
lastModifiedBy: 'LastModifiedBy1',
version: 11,
data: {}
});
expect(content).toEqual(
new ContentDto('id1', true, 'Created1', 'LastModifiedBy1',
DateTime.parseISO_UTC('2016-12-12T10:10'),
DateTime.parseISO_UTC('2017-12-12T10:10'),
{},
new Version('11')));
}));
it('should make post request to create content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
const dto = {};
let content: ContentDto | null = null;
contentsService.postContent('my-app', 'my-schema', dto, true, version).subscribe(result => {
content = result;
});
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema?publish=true');
expect(req.request.method).toEqual('POST');
expect(req.request.headers.get('If-Match')).toBe(version.value);
req.flush({
id: 'id1',
isPublished: true,
created: '2016-12-12T10:10',
createdBy: 'Created1',
lastModified: '2017-12-12T10:10',
lastModifiedBy: 'LastModifiedBy1',
version: 11,
data: {}
});
expect(content).toEqual(
new ContentDto('id1', true, 'Created1', 'LastModifiedBy1',
DateTime.parseISO_UTC('2016-12-12T10:10'),
DateTime.parseISO_UTC('2017-12-12T10:10'),
{},
new Version('11')));
}));
it('should make put request to update content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
const dto = {};
contentsService.putContent('my-app', 'my-schema', 'content1', dto, version).subscribe();
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1');
expect(req.request.method).toEqual('PUT');
expect(req.request.headers.get('If-Match')).toBe(version.value);
req.flush({});
}));
it('should make put request to publish content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
contentsService.publishContent('my-app', 'my-schema', 'content1', version).subscribe();
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/publish');
expect(req.request.method).toEqual('PUT');
expect(req.request.headers.get('If-Match')).toEqual(version.value);
req.flush({});
}));
it('should make put request to unpublish content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
contentsService.unpublishContent('my-app', 'my-schema', 'content1', version).subscribe();
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/unpublish');
expect(req.request.method).toEqual('PUT');
expect(req.request.headers.get('If-Match')).toEqual(version.value);
req.flush({});
}));
it('should make delete request to delete content',
inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => {
contentsService.deleteContent('my-app', 'my-schema', 'content1', version).subscribe();
const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1');
expect(req.request.method).toEqual('DELETE');
expect(req.request.headers.get('If-Match')).toEqual(version.value);
req.flush({});
}));
});
Write Preview
Loading…
Cancel
Save