mirror of
https://github.com/nasa/openmct.git
synced 2025-06-19 23:53:49 +00:00
Update test specs to use Jasmine 3 (#2089)
* Updated Karma and Jasmine versions * Added DOMObserver class. Supports promise-based testing of DOM changes Update asynchronous test specs to use promises or done() instead of waitsFor/runs * Modified ActionCapability to duplicate context object properties as own properties for better object equality comparisons * Global find + replace to fix syntax issues * Fixed various issues caused by non-deterministic runtime order of tests in Jasmine 3. Fixed issues caused by changes to determination of object equality * Addressed review comments * Resolved merge conflicts with master * Fixed style errors * Use spy.calls.count() instead of manually tracking
This commit is contained in:
committed by
Pete Richards
parent
013eba744d
commit
433dee0314
@ -28,24 +28,14 @@ define([
|
||||
var rootRegistry,
|
||||
rootObjectProvider;
|
||||
|
||||
function done() {
|
||||
var isDone = false;
|
||||
waitsFor(function () {
|
||||
return isDone;
|
||||
});
|
||||
return function () {
|
||||
isDone = true;
|
||||
};
|
||||
}
|
||||
|
||||
beforeEach(function () {
|
||||
rootRegistry = jasmine.createSpyObj('rootRegistry', ['getRoots']);
|
||||
rootRegistry.getRoots.andReturn(Promise.resolve(['some root']));
|
||||
rootRegistry.getRoots.and.returnValue(Promise.resolve(['some root']));
|
||||
rootObjectProvider = new RootObjectProvider(rootRegistry);
|
||||
});
|
||||
|
||||
it('supports fetching root', function () {
|
||||
rootObjectProvider.get()
|
||||
return rootObjectProvider.get()
|
||||
.then(function (root) {
|
||||
expect(root).toEqual({
|
||||
identifier: {
|
||||
@ -56,8 +46,7 @@ define([
|
||||
type: 'root',
|
||||
composition: ['some root']
|
||||
});
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
@ -30,16 +30,6 @@ define([
|
||||
idC,
|
||||
registry;
|
||||
|
||||
function done() {
|
||||
var isDone = false;
|
||||
waitsFor(function () {
|
||||
return isDone;
|
||||
});
|
||||
return function () {
|
||||
isDone = true;
|
||||
};
|
||||
}
|
||||
|
||||
beforeEach(function () {
|
||||
idA = {key: 'keyA', namespace: 'something'};
|
||||
idB = {key: 'keyB', namespace: 'something'};
|
||||
@ -49,42 +39,38 @@ define([
|
||||
|
||||
it('can register a root by key', function () {
|
||||
registry.addRoot(idA);
|
||||
registry.getRoots()
|
||||
return registry.getRoots()
|
||||
.then(function (roots) {
|
||||
expect(roots).toEqual([idA]);
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
|
||||
it('can register multiple roots by key', function () {
|
||||
registry.addRoot([idA, idB]);
|
||||
registry.getRoots()
|
||||
return registry.getRoots()
|
||||
.then(function (roots) {
|
||||
expect(roots).toEqual([idA, idB]);
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
|
||||
it('can register an asynchronous root ', function () {
|
||||
registry.addRoot(function () {
|
||||
return Promise.resolve(idA);
|
||||
});
|
||||
registry.getRoots()
|
||||
return registry.getRoots()
|
||||
.then(function (roots) {
|
||||
expect(roots).toEqual([idA]);
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
|
||||
it('can register multiple asynchronous roots', function () {
|
||||
registry.addRoot(function () {
|
||||
return Promise.resolve([idA, idB]);
|
||||
});
|
||||
registry.getRoots()
|
||||
return registry.getRoots()
|
||||
.then(function (roots) {
|
||||
expect(roots).toEqual([idA, idB]);
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
|
||||
it('can combine different types of registration', function () {
|
||||
@ -92,11 +78,10 @@ define([
|
||||
registry.addRoot(function () {
|
||||
return Promise.resolve([idC]);
|
||||
});
|
||||
registry.getRoots()
|
||||
return registry.getRoots()
|
||||
.then(function (roots) {
|
||||
expect(roots).toEqual([idA, idB, idC]);
|
||||
})
|
||||
.then(done());
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
Reference in New Issue
Block a user