Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 20:02:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(@angular-devkit/core): update host tests to not use deprecated Jasmine behaviour

Browse Source 
```
DEPRECATION: An asynchronous before/it/after function was defined with the async keyword but also took a done callback. This is not supported and will stop working in the future. Either remove the done callback (recommended) or remove the async keyword.
```
This commit is contained in:
Alan Agius 2021-05-27 11:09:05 +02:00 committed by Filipe Silva
parent 06af7d7e7b
commit f209cb5545
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/angular_devkit/core/src/workspace/core_spec.ts
View File

@ -19,7 +19,7 @@ import { WorkspaceDefinition } from './definitions';
import { WorkspaceHost } from './host'; import { WorkspaceHost } from './host';
describe('readWorkspace', () => { describe('readWorkspace', () => {
it('attempts to read from specified file path [angular.json]', async (done) => { it('attempts to read from specified file path [angular.json]', async () => {
const requestedPath = '/path/to/workspace/angular.json'; const requestedPath = '/path/to/workspace/angular.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -42,11 +42,9 @@ describe('readWorkspace', () => {
}; };
await readWorkspace(requestedPath, host); await readWorkspace(requestedPath, host);
done();
}); });
it('attempts to read from specified file path [.angular.json]', async (done) => { it('attempts to read from specified file path [.angular.json]', async () => {
const requestedPath = '/path/to/workspace/.angular.json'; const requestedPath = '/path/to/workspace/.angular.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -69,11 +67,9 @@ describe('readWorkspace', () => {
}; };
await readWorkspace(requestedPath, host); await readWorkspace(requestedPath, host);
done();
}); });
it('attempts to read from specified non-standard file path with format', async (done) => { it('attempts to read from specified non-standard file path with format', async () => {
const requestedPath = '/path/to/workspace/abc.json'; const requestedPath = '/path/to/workspace/abc.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -96,11 +92,9 @@ describe('readWorkspace', () => {
}; };
await readWorkspace(requestedPath, host, WorkspaceFormat.JSON); await readWorkspace(requestedPath, host, WorkspaceFormat.JSON);
done();
}); });
it('errors when reading from specified non-standard file path without format', async (done) => { it('errors when reading from specified non-standard file path without format', async () => {
const requestedPath = '/path/to/workspace/abc.json'; const requestedPath = '/path/to/workspace/abc.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -128,11 +122,9 @@ describe('readWorkspace', () => {
} catch (e) { } catch (e) {
expect(e.message).toContain('Unable to determine format for workspace path'); expect(e.message).toContain('Unable to determine format for workspace path');
} }
done();
}); });
it('errors when reading from specified file path with invalid specified format', async (done) => { it('errors when reading from specified file path with invalid specified format', async () => {
const requestedPath = '/path/to/workspace/angular.json'; const requestedPath = '/path/to/workspace/angular.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -160,11 +152,9 @@ describe('readWorkspace', () => {
} catch (e) { } catch (e) {
expect(e.message).toContain('Unsupported workspace format'); expect(e.message).toContain('Unsupported workspace format');
} }
done();
}); });
it('attempts to find/read from directory path', async (done) => { it('attempts to find/read from directory path', async () => {
const requestedPath = getSystemPath(normalize('/path/to/workspace')); const requestedPath = getSystemPath(normalize('/path/to/workspace'));
const expectedFile = getSystemPath(join(normalize(requestedPath), '.angular.json')); const expectedFile = getSystemPath(join(normalize(requestedPath), '.angular.json'));
@ -201,11 +191,9 @@ describe('readWorkspace', () => {
getSystemPath(join(normalize(requestedPath), '.angular.json')), getSystemPath(join(normalize(requestedPath), '.angular.json')),
].sort(), ].sort(),
); );
done();
}); });
it('attempts to find/read only files for specified format from directory path', async (done) => { it('attempts to find/read only files for specified format from directory path', async () => {
const requestedPath = '/path/to/workspace'; const requestedPath = '/path/to/workspace';
const isFileChecks: string[] = []; const isFileChecks: string[] = [];
@ -246,11 +234,9 @@ describe('readWorkspace', () => {
readFileChecks.sort(); readFileChecks.sort();
expect(readFileChecks).toEqual([getSystemPath(join(normalize(requestedPath), 'angular.json'))]); expect(readFileChecks).toEqual([getSystemPath(join(normalize(requestedPath), 'angular.json'))]);
done();
}); });
it('errors when no file found from specified directory path', async (done) => { it('errors when no file found from specified directory path', async () => {
const requestedPath = '/path/to/workspace'; const requestedPath = '/path/to/workspace';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -280,13 +266,11 @@ describe('readWorkspace', () => {
} catch (e) { } catch (e) {
expect(e.message).toContain('Unable to locate a workspace file'); expect(e.message).toContain('Unable to locate a workspace file');
} }
done();
}); });
}); });
describe('writeWorkspace', () => { describe('writeWorkspace', () => {
it('attempts to write to specified file path', async (done) => { it('attempts to write to specified file path', async () => {
const requestedPath = '/path/to/workspace/angular.json'; const requestedPath = '/path/to/workspace/angular.json';
let writtenPath: string | undefined; let writtenPath: string | undefined;
@ -314,11 +298,9 @@ describe('writeWorkspace', () => {
await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, WorkspaceFormat.JSON); await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, WorkspaceFormat.JSON);
expect(writtenPath).toBe(requestedPath); expect(writtenPath).toBe(requestedPath);
done();
}); });
it('errors when writing to specified file path with invalid specified format', async (done) => { it('errors when writing to specified file path with invalid specified format', async () => {
const requestedPath = '/path/to/workspace/angular.json'; const requestedPath = '/path/to/workspace/angular.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -348,11 +330,9 @@ describe('writeWorkspace', () => {
} catch (e) { } catch (e) {
expect(e.message).toContain('Unsupported workspace format'); expect(e.message).toContain('Unsupported workspace format');
} }
done();
}); });
it('errors when writing custom workspace without specified format', async (done) => { it('errors when writing custom workspace without specified format', async () => {
const requestedPath = '/path/to/workspace/angular.json'; const requestedPath = '/path/to/workspace/angular.json';
const host: WorkspaceHost = { const host: WorkspaceHost = {
@ -382,7 +362,5 @@ describe('writeWorkspace', () => {
} catch (e) { } catch (e) {
expect(e.message).toContain('A format is required'); expect(e.message).toContain('A format is required');
} }
done();
}); });
}); });

16
packages/angular_devkit/core/src/workspace/host_spec.ts
View File

@ -21,18 +21,16 @@ describe('createWorkspaceHost', () => {
workspaceHost = createWorkspaceHost(testHost); workspaceHost = createWorkspaceHost(testHost);
}); });
it('supports isFile', async (done) => { it('supports isFile', async () => {
expect(await workspaceHost.isFile('abc.txt')).toBeTruthy(); expect(await workspaceHost.isFile('abc.txt')).toBeTruthy();
expect(await workspaceHost.isFile('foo/bar.json')).toBeTruthy(); expect(await workspaceHost.isFile('foo/bar.json')).toBeTruthy();
expect(await workspaceHost.isFile('foo\\bar.json')).toBeTruthy(); expect(await workspaceHost.isFile('foo\\bar.json')).toBeTruthy();
expect(await workspaceHost.isFile('foo')).toBeFalsy(); expect(await workspaceHost.isFile('foo')).toBeFalsy();
expect(await workspaceHost.isFile('not.there')).toBeFalsy(); expect(await workspaceHost.isFile('not.there')).toBeFalsy();
done();
}); });
it('supports isDirectory', async (done) => { it('supports isDirectory', async () => {
expect(await workspaceHost.isDirectory('foo')).toBeTruthy(); expect(await workspaceHost.isDirectory('foo')).toBeTruthy();
expect(await workspaceHost.isDirectory('foo/')).toBeTruthy(); expect(await workspaceHost.isDirectory('foo/')).toBeTruthy();
expect(await workspaceHost.isDirectory('foo\\')).toBeTruthy(); expect(await workspaceHost.isDirectory('foo\\')).toBeTruthy();
@ -40,22 +38,16 @@ describe('createWorkspaceHost', () => {
expect(await workspaceHost.isDirectory('abc.txt')).toBeFalsy(); expect(await workspaceHost.isDirectory('abc.txt')).toBeFalsy();
expect(await workspaceHost.isDirectory('foo/bar.json')).toBeFalsy(); expect(await workspaceHost.isDirectory('foo/bar.json')).toBeFalsy();
expect(await workspaceHost.isDirectory('not.there')).toBeFalsy(); expect(await workspaceHost.isDirectory('not.there')).toBeFalsy();
done();
}); });
it('supports readFile', async (done) => { it('supports readFile', async () => {
expect(await workspaceHost.readFile('abc.txt')).toBe('abcdefg'); expect(await workspaceHost.readFile('abc.txt')).toBe('abcdefg');
done();
}); });
it('supports writeFile', async (done) => { it('supports writeFile', async () => {
await workspaceHost.writeFile('newfile', 'baz'); await workspaceHost.writeFile('newfile', 'baz');
expect(testHost.files.sort() as string[]).toEqual(['/abc.txt', '/foo/bar.json', '/newfile']); expect(testHost.files.sort() as string[]).toEqual(['/abc.txt', '/foo/bar.json', '/newfile']);
expect(testHost.$read('newfile')).toBe('baz'); expect(testHost.$read('newfile')).toBe('baz');
done();
}); });
}); });