Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Issue #SB-000 merge: Merge branch 'release-6.0.0_v13' into release-7.0.0 #3587

Merged
merged 15 commits into from
Apr 1, 2024
Merged

Issue #SB-000 merge: Merge branch 'release-6.0.0_v13' into release-7.0.0 #3587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5e6b8e8
Issue #ED-000 merge : Merge pull request #3495 from Sunbird-Ed/relea…
swayangjit Sep 21, 2023
159ace1
Issue #SB-000 merge: Merge branch 'release-5.1.0.10' into release-5.2…
swayangjit Oct 5, 2023
0d4edb3
Issue #SB-000 merge: Merge pull request #3500 from swayangjit/releas…
swayangjit Oct 5, 2023
b19c462
Issue #SB-000 merge: Merge branch 'release-5.1.0.10' into release-5.2…
swayangjit Oct 19, 2023
dbcce98
Issue #SB-000 merge: Merge pull request #3504 from swayangjit/releas…
swayangjit Nov 2, 2023
174832f
ISSUE #000 fix: LED IMP flow issue fix.
Nov 3, 2023
6ef841f
Issue #SB-000 fix: Merge pull request #3505 from shikshalokam/release…
swayangjit Nov 3, 2023
cfeea70
Merge pull request #3558 from swayangjit/release-6.0.0_v13
swayangjit Feb 28, 2024
14f162d
Issue #SB-000 merge: Merge branch 'release-5.1.0.10' into release-6.0…
swayangjit Feb 28, 2024
7889693
Merge pull request #3561 from swayangjit/release-6.0.0_v13
swayangjit Feb 28, 2024
7aac9bb
Issue #SB-000 merge: Merge branch 'release-5.2.0.1' into release-6.0.…
swayangjit Mar 21, 2024
6eb44f0
Issue #SB-000 merge: Merge pull request #3576 from swayangjit/releas…
swayangjit Mar 21, 2024
c2b52bc
ISSUE #ED-3837, ED-3824 fix : OCI issue fix, sync loader and evidence…
Mar 25, 2024
2f32659
Merge pull request #3580 from shikshalokam/release-6.0.0_OCI
swayangjit Mar 25, 2024
0950830
Issue #SB-000 merge: Merge branch 'release-6.0.0_v13' into release-7.0.0
swayangjit Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

309 changes: 2 additions & 307 deletions ...p/components/popups/download-transcript-popup/download-transcript-popup.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,13 @@ describe('DownloadTranscriptPopupComponent', () => {
}, 0);
});

it('should not download transcript file if api failed and hasPermission', (done) => {
it('should not download transcript file if api failed', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
mockCommonUtilService.isAndroidVer13 = jest.fn(() => false);
Expand Down Expand Up @@ -126,310 +125,6 @@ describe('DownloadTranscriptPopupComponent', () => {
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({isPermissionAlwaysDenied: true}));
mockCommonUtilService.showSettingsPageToast = jest.fn(() => {})
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([{
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'english'
}, {
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'hindi'
}]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied and hasPermission has false', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
const presentPopover = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn();
mockCommonUtilService.buildPermissionPopover = jest.fn(() => Promise.resolve({
present: presentPopover
}));
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([{
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'english'
}, {
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'hindi'
}]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied and hasPermission has false and not now is selected', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn(v => v);
mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
await callback(mockCommonUtilService.translateMessage('NOT_NOW'));
mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
mockCommonUtilService.showSettingsPageToast = jest.fn()
return {
present: jest.fn(() => Promise.resolve())
};
});
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([{
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'english'
}, {
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'hindi'
}]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied and hasPermission has false and allow is selected', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn(v => v);
mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
await callback(mockCommonUtilService.translateMessage('ALLOW'));
mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
mockAppGlobalService.isNativePopupVisible = true;
mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: true}))
mockAppGlobalService.setNativePopupVisible = jest.fn();
return {
present: jest.fn(() => Promise.resolve())
};
});
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([{
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'english'
}, {
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'hindi'
}]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
expect(dismissFn).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied and hasPermission has false and allow is selected and request isPermissionAlwaysDenied', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn(v => v);
mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
await callback(mockCommonUtilService.translateMessage('ALLOW'));
mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
mockAppGlobalService.isNativePopupVisible = true;
mockPermissionService.requestPermission = jest.fn(() => of({isPermissionAlwaysDenied: true}))
mockAppGlobalService.setNativePopupVisible = jest.fn();
return {
present: jest.fn(() => Promise.resolve())
};
});
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
expect(dismissFn).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if api failed and isPermissionAlwaysDenied and hasPermission has false and allow is selected and no request with hasPermission and isPermissionAlwaysDenied', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn(v => v);
mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
await callback(mockCommonUtilService.translateMessage('ALLOW'));
mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
mockAppGlobalService.isNativePopupVisible = true;
mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: false, isPermissionAlwaysDenied: false}))
mockAppGlobalService.setNativePopupVisible = jest.fn();
mockCommonUtilService.showSettingsPageToast = jest.fn();
return {
present: jest.fn(() => Promise.resolve())
};
});
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([{
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'english'
}, {
identifier: 'sample-do_id',
artifactUrl: 'http//:sample-url/do_id',
language: 'hindi'
}]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file and allow is selected and no request with hasPermission and isPermissionAlwaysDenied', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
mockCommonUtilService.getLoader = jest.fn(() => ({
present: presentFn,
dismiss: dismissFn,
}));
mockPlatform.is = jest.fn(platform => platform === 'android')
mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
mockCommonUtilService.translateMessage = jest.fn(v => v);
mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
await callback(mockCommonUtilService.translateMessage('Sample'));
mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
mockAppGlobalService.isNativePopupVisible = true;
mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: false, isPermissionAlwaysDenied: false}))
mockAppGlobalService.setNativePopupVisible = jest.fn();
mockCommonUtilService.showSettingsPageToast = jest.fn();
return {
present: jest.fn(() => Promise.resolve())
};
});
downloadTranscriptPopupComponent.contentData = {
transcripts: JSON.stringify([]),
name: 'transcript-content'
};
downloadTranscriptPopupComponent.transcriptLanguage = 'english';
mockContentService.downloadTranscriptFile = jest.fn(() => Promise.reject({error: 'api-failed'}));
// act
downloadTranscriptPopupComponent.download();
// assert
setTimeout(() => {
expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
expect(presentFn).toHaveBeenCalled();
expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
done();
}, 0);
});

it('should not download transcript file if transcript is not available', (done) => {
const dismissFn = jest.fn(() => Promise.resolve());
const presentFn = jest.fn(() => Promise.resolve());
Expand Down Expand Up @@ -670,4 +365,4 @@ describe('DownloadTranscriptPopupComponent', () => {
it('ngOnInit', () => {
downloadTranscriptPopupComponent.ngOnInit();
});
});
});
Loading