Unverified Commit 4706d621 authored by harishkumar gangula's avatar harishkumar gangula Committed by GitHub
Browse files

Merge pull request #2857 from swetha-aggidevara/faq-videos

Issue #SB-15832 fix: added test cases for help-videos
parents 6ff5ac1a a1fd0ee0
master Dark_theme SB-25589 SB-28090 aws_fileRead contributions dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/express-4.17.3 dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3 dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3 dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/express-4.17.3 dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/qs-6.10.3 filters_5.1.1 gcp gcp_test keshavprasadms-patch-1 keshavprasadms-patch-2 release-2.10.0 release-2.10.1 release-2.10.2 release-2.10.3 release-2.6.0 release-2.6.0-loadtest release-2.6.5 release-2.6.6 release-2.7.0 release-2.8.0 release-2.8.1 release-2.8.10 release-2.8.11 release-2.8.12 release-2.8.2 release-2.8.3 release-2.8.4 release-2.8.5 release-2.8.6 release-2.8.7 release-2.8.8 release-2.8.9 release-2.9.0 release-3.0 release-3.0-merge release-3.0.0 release-3.0.1 release-3.0.2 release-3.0.3 release-3.0.4 release-3.0.4-sso release-3.1.0 release-3.1.1 release-3.1.2 release-3.2.0 release-3.2.1 release-3.2.10 release-3.2.11 release-3.2.12 release-3.2.13 release-3.2.14 release-3.2.2 release-3.2.3 release-3.2.4 release-3.3.0 release-3.3.0-telemetry-fix release-3.3.1 release-3.3.2 release-3.4.0 release-3.4.1 release-3.4.2 release-3.4.3 release-3.4.4 release-3.4.5 release-3.4.6 release-3.4.7 release-3.5.0 release-3.5.1 release-3.5.2 release-3.5.3 release-3.6.0 release-3.6.1 release-3.6.5 release-3.6.6 release-3.7.0 release-3.7.1 release-3.7.2 release-3.8.0 release-3.8.1 release-3.8.2 release-3.8.3 release-3.9.0 release-3.9.1 release-3.9.2 release-3.9.3 release-4.0.0 release-4.0.1 release-4.0.2 release-4.1 release-4.1.0 release-4.1.1 release-4.10.0 release-4.10.0.1 release-4.10.1 release-4.10.2 release-4.10.2.1 release-4.10.2.2 release-4.10.3 release-4.2.0 release-4.2.1 release-4.3.0 release-4.3.1 release-4.4.0 release-4.4.1 release-4.5.0 release-4.5.1 release-4.5.2 release-4.6.0 release-4.7.0 release-4.7.1 release-4.8.0 release-4.8.5 release-4.9.0 release-4.9.1 release-5.0.0 release-5.0.0.1 release-5.0.0.2 release-5.0.0.3 release-5.0.1 release-5.0.2 release-5.1.0 release-5.1.1 release-sonarcloud revert-3718-copypi revert-3842-release-2.8.7 revert-3890-release-2.8.9 revert-4427-player-cache-issue revert-4537-SB-19763 revert-5244-sh-809 revert-5260-SB-table-3.3.0 revert-8284-release-5.0.0 sharathkashyap-patch-1 Tags unavailable
No related merge requests found
Showing with 92 additions and 29 deletions
+92 -29
import { By } from '@angular/platform-browser';
import { RouterTestingModule } from '@angular/router/testing';
import { ActivatedRoute, Router } from '@angular/router';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { ResourceService, SharedModule } from '@sunbird/shared';
import { TelemetryModule } from '@sunbird/telemetry';
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { OfflineHelpVideosComponent } from './offline-help-videos.component'; import { OfflineHelpVideosComponent } from './offline-help-videos.component';
xdescribe('OfflineHelpVideosComponent', () => { describe('OfflineHelpVideosComponent', () => {
let component: OfflineHelpVideosComponent; let component: OfflineHelpVideosComponent;
let fixture: ComponentFixture<OfflineHelpVideosComponent>; let fixture: ComponentFixture<OfflineHelpVideosComponent>;
let resourceServiceStub;
beforeEach(async(() => { beforeEach(async(() => {
const fakeActivatedRoute = {
snapshot: {
data: {
telemetry: {
env: 'help', pageid: 'help', type: 'view'
}
}
}
};
resourceServiceStub = {
instance: 'sunbird',
frmelmnts: {
instn: {
't0094': 'How do I add content to the {instance} desktop app when I am connected to the Internet?',
't0095': 'How do I add content to the {instance} desktop app when I am offline or using a pen drive?',
't0096': 'My Library: How and where can I find content in My Library?',
't0097': 'How do I copy content to my pen drive?'
}
}
};
const routerStub = {
navigateByUrl: jasmine.createSpy('navigateByUrl')
};
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ OfflineHelpVideosComponent ] declarations: [OfflineHelpVideosComponent],
imports: [TelemetryModule.forRoot(), HttpClientTestingModule, RouterTestingModule, SharedModule.forRoot()],
providers: [{ provide: ActivatedRoute, useValue: fakeActivatedRoute },
{ provide: ResourceService, useValue: resourceServiceStub },
{ provide: Router, useValue: routerStub}
]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
...@@ -19,7 +54,43 @@ xdescribe('OfflineHelpVideosComponent', () => { ...@@ -19,7 +54,43 @@ xdescribe('OfflineHelpVideosComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
}); });
it('should create', () => { it('should create', () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
it('should call setVideoHeight method', () => {
component.instance = resourceServiceStub.instance;
spyOn(component, 'setVideoHeight');
spyOn(component, 'interpolateInstance');
component.ngOnInit();
expect(component.slideData).toBeDefined();
expect(component.slideData[0]['id']).toEqual('add-content-online');
expect(component.setVideoHeight).toHaveBeenCalled();
expect(component.interpolateInstance).toHaveBeenCalled();
});
it('should changeVideoAttributes value', () => {
const data = component.slideData[1];
component.changeVideoAttributes(data);
expect(component.activeVideoObject).toBeDefined();
expect(component.activeVideoObject.id).toEqual('find-content-offline');
});
it('should changeVideoAttributes value', () => {
spyOn(component, 'changeVideoAttributes');
const data = (resourceServiceStub.frmelmnts.instn.t0094).replace('{instance}', (resourceServiceStub.instance).toUpperCase());
const button = fixture.debugElement.query(By.css('.sbcard.sbcard--recently-viewed.mb-8')).nativeElement;
const value = fixture.debugElement.query(By.css('h6')).nativeElement.innerText;
button.click();
expect(component.changeVideoAttributes).toHaveBeenCalled();
expect(value).toContain(data);
});
it('should emit an event' , () => {
spyOn(component.closeVideoModal, 'emit');
component.closeModal();
expect(component.closeVideoModal.emit).toHaveBeenCalled();
});
}); });
...@@ -59,27 +59,22 @@ export class OfflineHelpVideosComponent implements OnInit { ...@@ -59,27 +59,22 @@ export class OfflineHelpVideosComponent implements OnInit {
}, },
{ {
id: 'add-content-offline', id: 'add-content-offline',
name: this.interpolateInstance(this.resourceService.frmelmnts.instn.t0107), name: this.interpolateInstance(this.resourceService.frmelmnts.instn.t0095),
thumbnail: 'assets/images/play-icon.svg', thumbnail: 'assets/images/play-icon.svg',
url: 'assets/videos/How_do_I_add_content_to_the_desktop_app_when_I_am_offline_or_using_a_pen_drive.mp4' url: 'assets/videos/How_do_I_add_content_to_the_desktop_app_when_I_am_offline_or_using_a_pen_drive.mp4'
} }
]; ];
this.activeVideoObject = { this.activeVideoObject = this.slideData[0];
id: 'add-content-online', this.setVideoHeight();
name: this.interpolateInstance(this.resourceService.frmelmnts.instn.t0094),
thumbnail: 'assets/images/play-icon.svg',
url: 'assets/videos/How_do_I_add_content_to_the_desktop_app_when_I_am_connected_to_the_Internet.mp4'
};
// video height }
setTimeout(() => {
console.log('aspect ratio value', this.aspectRatio);
this.aspectRatioHeight = this.aspectRatio.nativeElement.offsetHeight;
this.playerInfoHeight = this.playerInfo.nativeElement.offsetHeight;
this.videoContainerHeight = this.aspectRatioHeight + this.playerInfoHeight;
}, 500); setVideoHeight() {
console.log('aspect ratio value', this.aspectRatio);
this.aspectRatioHeight = this.aspectRatio.nativeElement.offsetHeight;
this.playerInfoHeight = this.playerInfo.nativeElement.offsetHeight;
this.videoContainerHeight = this.aspectRatioHeight + this.playerInfoHeight;
} }
interpolateInstance(message) { interpolateInstance(message) {
...@@ -104,10 +99,8 @@ export class OfflineHelpVideosComponent implements OnInit { ...@@ -104,10 +99,8 @@ export class OfflineHelpVideosComponent implements OnInit {
} }
onWindowResize(event) { onWindowResize(event) {
setTimeout(() => {
this.aspectRatioHeight = event.target.document.querySelector('#help-video-aspect-ratio').offsetHeight; this.aspectRatioHeight = event.target.document.querySelector('#help-video-aspect-ratio').offsetHeight;
this.videoContainerHeight = this.aspectRatioHeight + this.playerInfoHeight; this.videoContainerHeight = this.aspectRatioHeight + this.playerInfoHeight;
}, 500);
} }
} }
...@@ -780,7 +780,6 @@ frmelmnts.instn.t0103 = Ext User ID * (State ID of the user) ...@@ -780,7 +780,6 @@ frmelmnts.instn.t0103 = Ext User ID * (State ID of the user)
frmelmnts.instn.t0104 = Input Status (ACTIVE, INACTIVE) * - Input record status as provided by state admin frmelmnts.instn.t0104 = Input Status (ACTIVE, INACTIVE) * - Input record status as provided by state admin
frmelmnts.instn.t0105 = Roles (System roles to be assigned to the user) frmelmnts.instn.t0105 = Roles (System roles to be assigned to the user)
frmelmnts.instn.t0106 = Save file as .csv before upload frmelmnts.instn.t0106 = Save file as .csv before upload
frmelmnts.instn.t0107 = How do I add content to the desktop app when I am offline or using a pen drive
frmelmnts.lbl.enterValidName = Enter a valid name. Only alphabets are allowed. frmelmnts.lbl.enterValidName = Enter a valid name. Only alphabets are allowed.
frmelmnts.lbl.improveYourExperience = Improve your Experience frmelmnts.lbl.improveYourExperience = Improve your Experience
frmelmnts.lbl.incompatibleBrowser = You seem to have an incompatible browser or browser version. frmelmnts.lbl.incompatibleBrowser = You seem to have an incompatible browser or browser version.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment