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/commonUI/mobile/test/DeviceClassifierSpec.js
View File

@@ -60,11 +60,11 @@ define(
'body',
['addClass']
);
mockDocument.find.andCallFake(function (sel) {
mockDocument.find.and.callFake(function (sel) {
return sel === 'body' && mockBody;
});
AGENT_SERVICE_METHODS.forEach(function (m) {
mockAgentService[m].andReturn(false);
mockAgentService[m].and.returnValue(false);
});
});
@@ -78,7 +78,7 @@ define(
beforeEach(function () {
trueMethods.forEach(function (m) {
mockAgentService[m].andReturn(true);
mockAgentService[m].and.returnValue(true);
});
classifier = new DeviceClassifier(
mockAgentService,

8
platform/commonUI/mobile/test/DeviceMatchersSpec.js
View File

@@ -43,10 +43,10 @@ define(
});
it("detects when a device is a desktop device", function () {
mockAgentService.isMobile.andReturn(false);
mockAgentService.isMobile.and.returnValue(false);
expect(DeviceMatchers.desktop(mockAgentService))
.toBe(true);
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
expect(DeviceMatchers.desktop(mockAgentService))
.toBe(false);
});
@@ -65,10 +65,10 @@ define(
"touch"
].forEach(function (deviceType) {
it("detects when a device is a " + deviceType + " device", function () {
mockAgentService[method(deviceType)].andReturn(true);
mockAgentService[method(deviceType)].and.returnValue(true);
expect(DeviceMatchers[deviceType](mockAgentService))
.toBe(true);
mockAgentService[method(deviceType)].andReturn(false);
mockAgentService[method(deviceType)].and.returnValue(false);
expect(DeviceMatchers[deviceType](mockAgentService))
.toBe(false);
});

30
platform/commonUI/mobile/test/MCTDeviceSpec.js
View File

@@ -47,12 +47,12 @@ define(
mockElement = jasmine.createSpyObj(name, JQLITE_METHODS);
mockClone = jasmine.createSpyObj(name, JQLITE_METHODS);
mockTransclude.andCallFake(function (fn) {
mockTransclude.and.callFake(function (fn) {
fn(mockClone);
});
// Look desktop-like by default
mockAgentService.isLandscape.andReturn(true);
mockAgentService.isLandscape.and.returnValue(true);
testAttrs = {};
@@ -85,40 +85,40 @@ define(
link();
expectExclusion();
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
link();
expectInclusion();
});
it("restricts element inclusion for tablet devices", function () {
testAttrs.mctDevice = "tablet";
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
link();
expectExclusion();
mockAgentService.isTablet.andReturn(true);
mockAgentService.isTablet.and.returnValue(true);
link();
expectInclusion();
});
it("restricts element inclusion for phone devices", function () {
testAttrs.mctDevice = "phone";
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
link();
expectExclusion();
mockAgentService.isPhone.andReturn(true);
mockAgentService.isPhone.and.returnValue(true);
link();
expectInclusion();
});
it("restricts element inclusion for desktop devices", function () {
testAttrs.mctDevice = "desktop";
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
link();
expectExclusion();
mockAgentService.isMobile.andReturn(false);
mockAgentService.isMobile.and.returnValue(false);
link();
expectInclusion();
});
@@ -128,19 +128,19 @@ define(
link();
expectExclusion();
mockAgentService.isPortrait.andReturn(true);
mockAgentService.isPortrait.and.returnValue(true);
link();
expectInclusion();
});
it("restricts element inclusion for landscape orientation", function () {
testAttrs.mctDevice = "landscape";
mockAgentService.isLandscape.andReturn(false);
mockAgentService.isPortrait.andReturn(true);
mockAgentService.isLandscape.and.returnValue(false);
mockAgentService.isPortrait.and.returnValue(true);
link();
expectExclusion();
mockAgentService.isLandscape.andReturn(true);
mockAgentService.isLandscape.and.returnValue(true);
link();
expectInclusion();
});
@@ -153,13 +153,13 @@ define(
// Neither portrait nor mobile, not called
expectExclusion();
mockAgentService.isPortrait.andReturn(true);
mockAgentService.isPortrait.and.returnValue(true);
link();
// Was portrait, but not mobile, so no
expectExclusion();
mockAgentService.isMobile.andReturn(true);
mockAgentService.isMobile.and.returnValue(true);
link();
expectInclusion();
});