alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update test specs to use Jasmine 3 (#2089)

Browse Source 
* 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:
Andrew Henry
2018-06-29 17:32:59 -07:00
committed by Pete Richards
parent 013eba744d
commit 433dee0314
305 changed files with 2866 additions and 3324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/policy/test/PolicyActionDecoratorSpec.js
View File

@@ -51,8 +51,8 @@ define(
];
testContext = { someKey: "some value" };
mockActionService.getActions.andReturn(testActions);
mockPolicyService.allow.andReturn(true);
mockActionService.getActions.and.returnValue(testActions);
mockPolicyService.allow.and.returnValue(true);
decorator = new PolicyActionDecorator(
mockPolicyService,
@@ -86,7 +86,7 @@ define(
it("filters out policy-disallowed actions", function () {
// Disallow the second action
mockPolicyService.allow.andCallFake(function (cat, candidate) {
mockPolicyService.allow.and.callFake(function (cat, candidate) {
return candidate.someKey !== 'b';
});
expect(decorator.getActions(testContext))

4
platform/policy/test/PolicyProviderSpec.js
View File

@@ -43,14 +43,14 @@ define(
];
mockPolicies = testPolicies.map(function (p) {
var mockPolicy = jasmine.createSpyObj("policy", ['allow']);
mockPolicy.allow.andCallFake(function () {
mockPolicy.allow.and.callFake(function () {
return p.result;
});
return mockPolicy;
});
mockPolicyConstructors = testPolicies.map(function (p, i) {
var mockPolicyConstructor = jasmine.createSpy();
mockPolicyConstructor.andReturn(mockPolicies[i]);
mockPolicyConstructor.and.returnValue(mockPolicies[i]);
mockPolicyConstructor.message = p.message;
mockPolicyConstructor.category = p.category;
return mockPolicyConstructor;

8
platform/policy/test/PolicyViewDecoratorSpec.js
View File

@@ -54,9 +54,9 @@ define(
{ someKey: "c" }
];
mockDomainObject.getId.andReturn('xyz');
mockViewService.getViews.andReturn(testViews);
mockPolicyService.allow.andReturn(true);
mockDomainObject.getId.and.returnValue('xyz');
mockViewService.getViews.and.returnValue(testViews);
mockPolicyService.allow.and.returnValue(true);
decorator = new PolicyViewDecorator(
mockPolicyService,
@@ -90,7 +90,7 @@ define(
it("filters out policy-disallowed views", function () {
// Disallow the second action
mockPolicyService.allow.andCallFake(function (cat, candidate) {
mockPolicyService.allow.and.callFake(function (cat, candidate) {
return candidate.someKey !== 'b';
});
expect(decorator.getViews(mockDomainObject))