Skip to content

Commit

Permalink
Issue #SB-000 merge: Merge pull request #3576 from swayangjit/release…
Browse files Browse the repository at this point in the history 
…-6.0.0_v13

Issue #SB-000 merge: Merge branch 'release-5.2.0.1' into release-6.0.0_v13
  • Loading branch information
@swayangjit
swayangjit authored Mar 21, 2024
2 parents 7889693 + 7aac9bb commit 6eb44f0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 310 deletions.
11 changes: 11 additions & 0 deletions package-lock.json
View file

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

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
"cordova-plugin-app-version": "^0.1.14",
"cordova-plugin-awesome-shared-preferences": "git+https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git",
"cordova-plugin-badge-fix": "^0.8.10",
"cordova-plugin-camera": "git+https://github.com/vishwanath1004/cordova-plugin-camera.git",
"cordova-plugin-camera": "git+https://github.com/shikshalokam/cordova-plugin-camera.git",
"cordova-plugin-code-push": "git+https://github.com/swayangjit/cordova-plugin-code-push.git",
"cordova-plugin-console": "^1.1.0",
"cordova-plugin-fcm-with-dependecy-updated": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.1.2",
Expand Down Expand Up @@ -390,4 +390,4 @@
"<rootDir>/src/app/manage-learn/"
]
}
}
}
309 changes: 2 additions & 307 deletions ...p/components/popups/download-transcript-popup/download-transcript-popup.component.spec.ts
View file
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();
});
});
});
2 changes: 1 addition & 1 deletion src/app/profile/profile.page.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import { ProfileHandler } from '../../services/profile-handler';
import { SegmentationTagService } from '../../services/segmentation-tag/segmentation-tag.service';
import { CertificateService } from '@project-sunbird/sunbird-sdk';
import { LocationHandler } from '../../services/location-handler';
import { UnnatiDataService } from '../manage-learn/core/services/unnati-data.service';
import { ContentCard } from '../app.constant';
import { UnnatiDataService } from '../manage-learn/core/services/unnati-data.service';

describe('Profile.page', () => {
let profilePage: ProfilePage;
Expand Down

0 comments on commit 6eb44f0

Please sign in to comment.