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
@@ -44,8 +44,8 @@ define(
|
||||
["requestTelemetry", "subscribe"]
|
||||
),
|
||||
unsubscribe = jasmine.createSpy("unsubscribe" + index);
|
||||
provider.requestTelemetry.andReturn({ someKey: key });
|
||||
provider.subscribe.andReturn(unsubscribe);
|
||||
provider.requestTelemetry.and.returnValue({ someKey: key });
|
||||
provider.subscribe.and.returnValue(unsubscribe);
|
||||
|
||||
// Store to verify interactions later
|
||||
mockUnsubscribes[index] = unsubscribe;
|
||||
@@ -54,7 +54,7 @@ define(
|
||||
|
||||
beforeEach(function () {
|
||||
mockQ = jasmine.createSpyObj("$q", ["all"]);
|
||||
mockQ.all.andReturn(mockPromise([]));
|
||||
mockQ.all.and.returnValue(mockPromise([]));
|
||||
|
||||
mockUnsubscribes = [];
|
||||
mockProviders = ["a", "b", "c"].map(makeMockProvider);
|
||||
@@ -79,7 +79,7 @@ define(
|
||||
it("merges results from all providers", function () {
|
||||
var capture = jasmine.createSpy("capture");
|
||||
|
||||
mockQ.all.andReturn(mockPromise([
|
||||
mockQ.all.and.returnValue(mockPromise([
|
||||
{ someKey: "some value" },
|
||||
{ someOtherKey: "some other value" }
|
||||
]));
|
||||
|
||||
Reference in New Issue
Block a user