Skip to content

Commit da9a035

Browse files
committed
Pass failing fission tests
1 parent d0eada7 commit da9a035

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

main-integrate-fission-tests.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
4848
const item = mod._ZDRWrap({
4949
ZDRParamLibrary: uStubFission({
5050
initialize: (function () {
51-
return {
51+
return Promise.resolve({
5252
scenario: uStubFission().Scenario[uRandomElement('AuthSucceeded', 'Continuation')],
5353
username,
54-
};
54+
});
5555
}),
5656
}),
5757
ZDRParamScopes: [uStubScope()],
@@ -92,10 +92,10 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
9292
_ZDRStorageFission({
9393
ZDRParamLibrary: uStubFission({
9494
initialize: (function () {
95-
return {
95+
return Promise.resolve({
9696
scenario: uStubFission().Scenario['NotAuthorised'],
9797
permissions,
98-
};
98+
});
9999
}),
100100
redirectToLobby: (function () {
101101
return rej([...arguments]);
@@ -111,9 +111,9 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
111111
_ZDRStorageFission({
112112
ZDRParamLibrary: uStubFission({
113113
initialize: (function () {
114-
return {
114+
return Promise.resolve({
115115
scenario: uStubFission().Scenario[uRandomElement('AuthSucceeded', 'Continuation')],
116-
};
116+
});
117117
}),
118118
}),
119119
ZDRParamDispatchReady: (function () {
@@ -433,10 +433,10 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
433433
const api = _ZDRStorageFission({
434434
ZDRParamLibrary: uStubFission({
435435
initialize: (function () {
436-
return {
436+
return Promise.resolve({
437437
scenario: uStubFission().Scenario[uRandomElement('AuthSucceeded', 'Continuation')],
438438
username,
439-
};
439+
});
440440
}),
441441
}),
442442
ZDRScopeDirectory,
@@ -493,7 +493,7 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
493493
}).ZDRCloudConnect(Math.random().toString());
494494
}).pop().permissions, {
495495
fs: {
496-
privatePaths: [
496+
private: [
497497
ZDRScopeDirectory,
498498
],
499499
},
@@ -520,7 +520,7 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
520520
}).ZDRCloudConnect(Math.random().toString());
521521
}).pop().permissions, {
522522
fs: {
523-
privatePaths: [
523+
private: [
524524
ZDRScopeDirectory1,
525525
ZDRScopeDirectory2,
526526
],
@@ -581,7 +581,7 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
581581
});
582582
});
583583

584-
it('calls initialize with publicPaths if ZDRScopeIsPublic', function () {
584+
it('calls initialize with public if ZDRScopeIsPublic', function () {
585585
const ZDRScopeDirectory = Math.random().toString();
586586

587587
deepEqual(uCapture(function (capture) {
@@ -599,7 +599,7 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
599599
}).ZDRCloudConnect(Math.random().toString());
600600
}).pop().permissions, {
601601
fs: {
602-
publicPaths: [
602+
public: [
603603
ZDRScopeDirectory,
604604
],
605605
},
@@ -634,10 +634,10 @@ describe('_ZDRWrap_Fission', function test__ZDRWrap_Fission() {
634634
creator: ZDRScopeCreatorDirectory,
635635
},
636636
fs: {
637-
publicPaths: [
637+
public: [
638638
ZDRScopeDirectory,
639639
],
640-
privatePaths: [
640+
private: [
641641
ZDRScopeDirectory,
642642
],
643643
},

main.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,11 @@ const mod = {
213213
},
214214

215215
__ZDRFissionPathFile(inputData) {
216-
return webnative.path.file(...mod.__ZDRFissionPathElements(inputData));
216+
return typeof webnative === 'undefined' ? inputData : webnative.path.file(...mod.__ZDRFissionPathElements(inputData));
217217
},
218218

219219
__ZDRFissionPathDirectory(inputData) {
220-
return webnative.path.directory(...mod.__ZDRFissionPathElements(inputData));
220+
return typeof webnative === 'undefined' ? inputData : webnative.path.directory(...mod.__ZDRFissionPathElements(inputData));
221221
},
222222

223223
_ZDRModelSyncCallbackSignatures() {
@@ -595,8 +595,7 @@ const mod = {
595595
return;
596596
}
597597

598-
const state = await library.initialize(fissionPermissions).catch(function (error) {
599-
});
598+
const state = await library.initialize(fissionPermissions).catch(function (error) {});
600599

601600
if (!state) {
602601
return inputData._ZDRParamDispatchInitialisationError && inputData._ZDRParamDispatchInitialisationError();
@@ -794,7 +793,7 @@ const mod = {
794793
throw new Error('ZDRErrorInputNotValid');
795794
}
796795

797-
return ((ZDRStorageProtocol === mod.ZDRProtocolFission() ? `/${ pretty ? 'p' : (item.ZDRScopeIsPublic ? 'public' : 'private') }/${ item.ZDRScopeCreatorDirectory ? `Apps/${ item.ZDRScopeCreatorDirectory }/${ item.ZDRScopeDirectory }` : item.ZDRScopeDirectory }` : '') + inputData).slice(ZDRStorageProtocol === mod.ZDRProtocolRemoteStorage() && inputData[0] === '/' ? 1 : 0);
796+
return ((ZDRStorageProtocol === mod.ZDRProtocolFission() ? `/${ pretty ? 'p' : (item.ZDRScopeIsPublic ? 'public' : 'private') }/${ item.ZDRScopeCreatorDirectory ? `Apps/${ item.ZDRScopeCreatorDirectory }/${ item.ZDRScopeDirectory }` : item.ZDRScopeDirectory }/` : '') + inputData).slice(ZDRStorageProtocol === mod.ZDRProtocolRemoteStorage() && inputData[0] === '/' ? 1 : 0);
798797
};
799798

800799
return Object.assign(coll, {

0 commit comments

Comments
 (0)