mirror of https://github.com/OpenVidu/openvidu.git
openvidu-components: Added webcomponent E2E tests
csantosm
parent
442119d0e4
commit
facc06bebc
|
|
@ -26,10 +26,16 @@ nbactions.xml
|
||||||
*/.settings/*
|
*/.settings/*
|
||||||
*/.tscache/*
|
*/.tscache/*
|
||||||
|
|
||||||
openvidu-components-angular/node_modules/
|
**/node_modules/
|
||||||
|
**/.angular/
|
||||||
openvidu-components-angular/.angular/
|
**/.vscode
|
||||||
|
|
||||||
openvidu-components-angular/dist/
|
openvidu-components-angular/dist/
|
||||||
|
openvidu-components-angular/coverage/**
|
||||||
openvidu-components-angular/openvidu-webcomponent/
|
openvidu-components-angular/openvidu-webcomponent/
|
||||||
|
openvidu-components-angular/openvidu-angular-doc/
|
||||||
|
|
||||||
|
openvidu-components-angular/webcomponent-test-e2e/dist/
|
||||||
|
|
||||||
|
openvidu-components-angular/webcomponent-test-e2e/web/openvidu-webcomponent-dev.css
|
||||||
|
|
||||||
|
openvidu-components-angular/webcomponent-test-e2e/web/openvidu-webcomponent-dev.js
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,13 @@ const VERSION = require("./package.json").version;
|
||||||
module.exports.buildWebcomponent = async () => {
|
module.exports.buildWebcomponent = async () => {
|
||||||
console.log("Building OpenVidu Web Component (" + VERSION + ")");
|
console.log("Building OpenVidu Web Component (" + VERSION + ")");
|
||||||
const tutorialWcPath = "../../openvidu-tutorials/openvidu-webcomponent/web";
|
const tutorialWcPath = "../../openvidu-tutorials/openvidu-webcomponent/web";
|
||||||
const e2eWcPath = "../webcomponent-test-e2e/web";
|
const e2eWcPath = "./webcomponent-test-e2e/web";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await buildElement();
|
await buildElement();
|
||||||
await copyFiles(tutorialWcPath);
|
await copyFiles(tutorialWcPath);
|
||||||
await copyFiles(e2eWcPath);
|
await copyFiles(e2eWcPath);
|
||||||
|
await renameWebComponentTestName(e2eWcPath);
|
||||||
|
|
||||||
console.log("OpenVidu Web Component (" + VERSION + ") built");
|
console.log("OpenVidu Web Component (" + VERSION + ") built");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
@ -20,14 +21,9 @@ module.exports.buildWebcomponent = async () => {
|
||||||
|
|
||||||
async function buildElement() {
|
async function buildElement() {
|
||||||
const files = [
|
const files = [
|
||||||
// "./dist/openvidu-call/runtime.js",
|
|
||||||
// "./dist/openvidu-call/polyfills.js",
|
|
||||||
// "./dist/openvidu-call/scripts.js",
|
|
||||||
// "./dist/openvidu-call/main.js",
|
|
||||||
"./dist/openvidu-webcomponent/runtime.js",
|
"./dist/openvidu-webcomponent/runtime.js",
|
||||||
"./dist/openvidu-webcomponent/main.js",
|
"./dist/openvidu-webcomponent/main.js",
|
||||||
"./dist/openvidu-webcomponent/polyfills.js",
|
"./dist/openvidu-webcomponent/polyfills.js"
|
||||||
// "./dist/openvidu-webcomponent/scripts.js",
|
|
||||||
];
|
];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
@ -50,6 +46,11 @@ async function buildElement() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renameWebComponentTestName(dir) {
|
||||||
|
fs.renameSync(`${dir}/openvidu-webcomponent-${VERSION}.js`, `${dir}/openvidu-webcomponent-dev.js`);
|
||||||
|
fs.renameSync(`${dir}/openvidu-webcomponent-${VERSION}.css`, `${dir}/openvidu-webcomponent-dev.css`);
|
||||||
|
}
|
||||||
|
|
||||||
async function copyFiles(destination) {
|
async function copyFiles(destination) {
|
||||||
if (fs.existsSync(destination)) {
|
if (fs.existsSync(destination)) {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,6 +9,8 @@
|
||||||
"lib:copy": "cp dist/openvidu-angular/openvidu-angular-*.tgz ../openvidu-tutorials/openvidu-angular-components",
|
"lib:copy": "cp dist/openvidu-angular/openvidu-angular-*.tgz ../openvidu-tutorials/openvidu-angular-components",
|
||||||
"lib:test": "ng test openvidu-angular --no-watch --code-coverage",
|
"lib:test": "ng test openvidu-angular --no-watch --code-coverage",
|
||||||
"webcomponent:build": "./node_modules/@angular/cli/bin/ng.js build openvidu-webcomponent --configuration production && node ./openvidu-webcomponent-build.js",
|
"webcomponent:build": "./node_modules/@angular/cli/bin/ng.js build openvidu-webcomponent --configuration production && node ./openvidu-webcomponent-build.js",
|
||||||
|
"webcomponent:prepare-test-e2e": "npm run lib:build && npm run webcomponent:build",
|
||||||
|
"webcomponent:e2e": "npm run --prefix webcomponent-test-e2e test",
|
||||||
"bundle-report": "ng build openvidu-webcomponent --stats-json --configuration production && webpack-bundle-analyzer dist/openvidu-webcomponent/stats.json",
|
"bundle-report": "ng build openvidu-webcomponent --stats-json --configuration production && webpack-bundle-analyzer dist/openvidu-webcomponent/stats.json",
|
||||||
"lint": "ng lint",
|
"lint": "ng lint",
|
||||||
"e2e": "ng e2e"
|
"e2e": "ng e2e"
|
||||||
|
|
@ -27,13 +29,13 @@
|
||||||
"@angular/router": "13.0.0",
|
"@angular/router": "13.0.0",
|
||||||
"autolinker": "3.14.3",
|
"autolinker": "3.14.3",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"openvidu-browser": "2.21.0-beta1",
|
"openvidu-browser": "^2.21.0",
|
||||||
"rxjs": "7.4.0",
|
"rxjs": "7.4.0",
|
||||||
"tslib": "2.3.1",
|
"tslib": "2.3.1",
|
||||||
"zone.js": "0.11.4"
|
"zone.js": "0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "13.0.1",
|
"@angular-devkit/build-angular": "13.2.5",
|
||||||
"@angular/cli": "13.0.1",
|
"@angular/cli": "13.0.1",
|
||||||
"@angular/compiler": "13.0.0",
|
"@angular/compiler": "13.0.0",
|
||||||
"@angular/compiler-cli": "13.0.0",
|
"@angular/compiler-cli": "13.0.0",
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,3 @@
|
||||||
|
|
||||||
# You can see what browsers were selected by your queries by running:
|
# You can see what browsers were selected by your queries by running:
|
||||||
# npx browserslist
|
# npx browserslist
|
||||||
|
|
||||||
last 1 Chrome version
|
|
||||||
last 1 Firefox version
|
|
||||||
last 2 Edge major versions
|
|
||||||
last 2 Safari major versions
|
|
||||||
last 2 iOS major versions
|
|
||||||
Firefox ESR
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"@angular/flex-layout": "^13.0.0-beta.36",
|
"@angular/flex-layout": "^13.0.0-beta.36",
|
||||||
"autolinker": "^3.14.3",
|
"autolinker": "^3.14.3",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"openvidu-browser": "^2.20.0"
|
"openvidu-browser": "^2.21.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.3.0"
|
"tslib": "^2.3.0"
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,11 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
::ng-deep .participant-action-buttons > *:not(#action-btn) {
|
::ng-deep .participant-action-buttons > *:not(#mute-btn) {
|
||||||
display: contents;
|
display: contents;
|
||||||
}
|
}
|
||||||
|
|
||||||
::ng-deep .participant-action-buttons > *:not(#action-btn) > * {
|
::ng-deep .participant-action-buttons > *:not(#mute-btn) > * {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -31,7 +31,7 @@ mat-list {
|
||||||
display: contents;
|
display: contents;
|
||||||
}
|
}
|
||||||
|
|
||||||
#action-btn {
|
#mute-btn {
|
||||||
border-radius: var(--ov-buttons-radius);
|
border-radius: var(--ov-buttons-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="participant-action-buttons">
|
<div class="participant-action-buttons">
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
id="action-btn"
|
id="mute-btn"
|
||||||
*ngIf="!_participant.local && showMuteButton"
|
*ngIf="!_participant.local && showMuteButton"
|
||||||
[class.warn-btn]="_participant.isMutedForcibly"
|
[class.warn-btn]="_participant.isMutedForcibly"
|
||||||
(click)="toggleMuteForcibly()"
|
(click)="toggleMuteForcibly()"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="participants-container">
|
<div class="participants-container" id="participants-container">
|
||||||
<div class="header-container">
|
<div class="header-container">
|
||||||
<h3>Participants</h3>
|
<h3>Participants</h3>
|
||||||
<button mat-icon-button matTooltip="Close" (click)="close()">
|
<button mat-icon-button matTooltip="Close" (click)="close()">
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
<mat-divider *ngIf="true"></mat-divider>
|
<mat-divider *ngIf="true"></mat-divider>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="remote-participants-container" *ngIf="remoteParticipants.length > 0">
|
<div class="remote-participants-container" id="remote-participants-container" *ngIf="remoteParticipants.length > 0">
|
||||||
|
|
||||||
<div *ngFor="let participant of this.remoteParticipants">
|
<div *ngFor="let participant of this.remoteParticipants" id="remote-participant-item">
|
||||||
<ng-container *ngTemplateOutlet="participantPanelItemTemplate; context: { $implicit: participant }"></ng-container>
|
<ng-container *ngTemplateOutlet="participantPanelItemTemplate; context: { $implicit: participant }"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="container" fxLayout.gt-sm="row" fxLayout.lt-md="column">
|
<div class="container" id="prejoin-container" fxLayout.gt-sm="row" fxLayout.lt-md="column">
|
||||||
<div fxFlex.gt-sm="65%" fxFlex.lt-md="55%" fxLayoutAlign="center center" id="layout-container">
|
<div fxFlex.gt-sm="65%" fxFlex.lt-md="55%" fxLayoutAlign="center center" id="layout-container">
|
||||||
<ov-layout>
|
<ov-layout>
|
||||||
<ng-template #stream let-stream>
|
<ng-template #stream let-stream>
|
||||||
|
|
@ -49,8 +49,8 @@
|
||||||
[class.warn-btn]="isVideoMuted"
|
[class.warn-btn]="isVideoMuted"
|
||||||
(click)="toggleCam()"
|
(click)="toggleCam()"
|
||||||
>
|
>
|
||||||
<mat-icon *ngIf="!isVideoMuted" matTooltip="Mute Camera">videocam</mat-icon>
|
<mat-icon *ngIf="!isVideoMuted" matTooltip="Mute Camera" id="videocam">videocam</mat-icon>
|
||||||
<mat-icon *ngIf="isVideoMuted" matTooltip="Unmute Camera">videocam_off</mat-icon>
|
<mat-icon *ngIf="isVideoMuted" matTooltip="Unmute Camera" id="videocam_off">videocam_off</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<mat-label>Video devices</mat-label>
|
<mat-label>Video devices</mat-label>
|
||||||
|
|
@ -71,8 +71,8 @@
|
||||||
[class.warn-btn]="isAudioMuted"
|
[class.warn-btn]="isAudioMuted"
|
||||||
(click)="toggleMic()"
|
(click)="toggleMic()"
|
||||||
>
|
>
|
||||||
<mat-icon *ngIf="!isAudioMuted" matTooltip="Mute Audio">mic</mat-icon>
|
<mat-icon *ngIf="!isAudioMuted" matTooltip="Mute Audio" id="mic">mic</mat-icon>
|
||||||
<mat-icon *ngIf="isAudioMuted" matTooltip="Unmute Audio">mic_off</mat-icon>
|
<mat-icon *ngIf="isAudioMuted" matTooltip="Unmute Audio" id="mic_off">mic_off</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<mat-form-field>
|
<mat-form-field>
|
||||||
<mat-label>Audio devices</mat-label>
|
<mat-label>Audio devices</mat-label>
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-icons, .videoButtons {
|
.status-icons, #settings-container {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
|
|
@ -77,7 +77,7 @@
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-icons button, .videoButtons button {
|
.status-icons button, #settings-container button {
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
width: 26px;
|
width: 26px;
|
||||||
height: 26px;
|
height: 26px;
|
||||||
|
|
@ -89,19 +89,19 @@
|
||||||
background-color: var(--ov-warn-color);
|
background-color: var(--ov-warn-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-icons .mat-icon-button, .videoButtons .mat-icon-button{
|
.status-icons .mat-icon-button, #settings-container .mat-icon-button{
|
||||||
line-height: 0px;
|
line-height: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-icons mat-icon, .videoButtons mat-icon {
|
.status-icons mat-icon, #settings-container mat-icon {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.videoButtons{
|
#settings-container{
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.videoButtons button {
|
#settings-container button {
|
||||||
background-color: var(--ov-dark-color);
|
background-color: var(--ov-dark-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
[id]="'container-' + this._stream.streamManager?.stream?.streamId"
|
[id]="'container-' + this._stream.streamManager?.stream?.streamId"
|
||||||
#streamContainer
|
#streamContainer
|
||||||
>
|
>
|
||||||
<div *ngIf="!isMinimal && showNickname" class="nickname" [class.fullscreen]="isFullscreen">
|
<div *ngIf="!isMinimal && showNickname" id="nickname-container" class="nickname" [class.fullscreen]="isFullscreen">
|
||||||
<div (click)="toggleNicknameForm()" class="nicknameContainer" selected *ngIf="!toggleNickname">
|
<div (click)="toggleNicknameForm()" class="nicknameContainer" selected *ngIf="!toggleNickname">
|
||||||
<span id="nickname" *ngIf="this._stream.type === 'CAMERA'">{{ this._stream.participant.nickname }}</span>
|
<span id="nickname" *ngIf="this._stream.type === 'CAMERA'">{{ this._stream.participant.nickname }}</span>
|
||||||
<span id="nickname" *ngIf="this._stream.type === 'SCREEN'">{{ this._stream.participant.nickname }}_SCREEN</span>
|
<span id="nickname" *ngIf="this._stream.type === 'SCREEN'">{{ this._stream.participant.nickname }}_SCREEN</span>
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="!isMinimal && showSettingsButton" class="videoButtons">
|
<div *ngIf="!isMinimal && showSettingsButton" id="settings-container" class="videoButtons">
|
||||||
<button mat-icon-button (click)="toggleVideoMenu($event)" matTooltip="Settings" aria-label="Video settings menu">
|
<button mat-icon-button (click)="toggleVideoMenu($event)" matTooltip="Settings" aria-label="Video settings menu">
|
||||||
<mat-icon>more_vert</mat-icon>
|
<mat-icon>more_vert</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#img-container {
|
#info-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#session-title {
|
#session-name {
|
||||||
font-family: 'Ubuntu', sans-serif;
|
font-family: 'Ubuntu', sans-serif;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
@media (max-width: 750px) {
|
@media (max-width: 750px) {
|
||||||
#session-title {
|
#session-name {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,40 @@
|
||||||
<mat-toolbar id="toolbar" role="heading" fxLayout fxLayoutAlign="center" fxLayoutGap="10px">
|
<mat-toolbar id="toolbar" role="heading" fxLayout fxLayoutAlign="center" fxLayoutGap="10px">
|
||||||
<div fxFlex="20%" fxLayoutAlign="start center">
|
<div fxFlex="20%" fxLayoutAlign="start center">
|
||||||
<div id="img-container">
|
<div id="info-container">
|
||||||
<img *ngIf="!isMinimal && showLogo" id="branding-logo" src="assets/images/logo.png" ovLogo />
|
<img *ngIf="!isMinimal && showLogo" id="branding-logo" src="assets/images/logo.png" ovLogo />
|
||||||
<span id="session-title" *ngIf="!isMinimal && session && session.sessionId && showSessionName">{{ session.sessionId }}</span>
|
<span id="session-name" *ngIf="!isMinimal && session && session.sessionId && showSessionName">{{ session.sessionId }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div fxFlex="60%" fxFlexOrder="2" fxLayoutAlign="center center" id="media-buttons-container">
|
<div fxFlex="60%" fxFlexOrder="2" fxLayoutAlign="center center" id="media-buttons-container">
|
||||||
<!-- Microphone button -->
|
<!-- Microphone button -->
|
||||||
<button
|
<button
|
||||||
id="navMicrophoneButton"
|
id="mic-btn"
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
(click)="toggleMicrophone()"
|
(click)="toggleMicrophone()"
|
||||||
[disabled]="isConnectionLost || !hasAudioDevices"
|
[disabled]="isConnectionLost || !hasAudioDevices"
|
||||||
[class.warn-btn]="!isWebcamAudioActive"
|
[class.warn-btn]="!isWebcamAudioActive"
|
||||||
>
|
>
|
||||||
<mat-icon *ngIf="isWebcamAudioActive" matTooltip="Mute your audio">mic</mat-icon>
|
<mat-icon *ngIf="isWebcamAudioActive" matTooltip="Mute your audio" id="mic">mic</mat-icon>
|
||||||
<mat-icon *ngIf="!isWebcamAudioActive" matTooltip="Unmute your audio">mic_off</mat-icon>
|
<mat-icon *ngIf="!isWebcamAudioActive" matTooltip="Unmute your audio" id="mic_off">mic_off</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Camera button -->
|
<!-- Camera button -->
|
||||||
<button
|
<button
|
||||||
id="navCameraButton"
|
id="camera-btn"
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
(click)="toggleCamera()"
|
(click)="toggleCamera()"
|
||||||
[disabled]="isConnectionLost || !hasVideoDevices"
|
[disabled]="isConnectionLost || !hasVideoDevices"
|
||||||
[class.warn-btn]="!isWebcamVideoActive"
|
[class.warn-btn]="!isWebcamVideoActive"
|
||||||
>
|
>
|
||||||
<mat-icon *ngIf="isWebcamVideoActive" matTooltip="Mute your cam">videocam</mat-icon>
|
<mat-icon *ngIf="isWebcamVideoActive" matTooltip="Mute your cam" id="videocam">videocam</mat-icon>
|
||||||
<mat-icon *ngIf="!isWebcamVideoActive" matTooltip="Unmute your cam">videocam_off</mat-icon>
|
<mat-icon *ngIf="!isWebcamVideoActive" matTooltip="Unmute your cam" id="videocam_off">videocam_off</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Screenshare button -->
|
<!-- Screenshare button -->
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
*ngIf="!isMinimal && showScreenshareButton"
|
*ngIf="!isMinimal && showScreenshareButton"
|
||||||
id="navScreenButton"
|
id="screenshare-btn"
|
||||||
(click)="toggleScreenShare()"
|
(click)="toggleScreenShare()"
|
||||||
[disabled]="isConnectionLost"
|
[disabled]="isConnectionLost"
|
||||||
[class.active-btn]="isScreenShareActive"
|
[class.active-btn]="isScreenShareActive"
|
||||||
|
|
@ -46,6 +46,7 @@
|
||||||
<!-- Fullscreen button -->
|
<!-- Fullscreen button -->
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
|
id="fullscreen-btn"
|
||||||
*ngIf="!isMinimal && showFullscreenButton"
|
*ngIf="!isMinimal && showFullscreenButton"
|
||||||
(click)="toggleFullscreen()"
|
(click)="toggleFullscreen()"
|
||||||
[disabled]="isConnectionLost"
|
[disabled]="isConnectionLost"
|
||||||
|
|
@ -69,6 +70,7 @@
|
||||||
<!-- Default participants button -->
|
<!-- Default participants button -->
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
|
id="participants-panel-btn"
|
||||||
*ngIf="!isMinimal && showParticipantsPanelButton"
|
*ngIf="!isMinimal && showParticipantsPanelButton"
|
||||||
matTooltip="Show articipants"
|
matTooltip="Show articipants"
|
||||||
(click)="toggleParticipantsPanel()"
|
(click)="toggleParticipantsPanel()"
|
||||||
|
|
@ -81,6 +83,7 @@
|
||||||
<!-- Default chat button -->
|
<!-- Default chat button -->
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
|
id="chat-panel-btn"
|
||||||
*ngIf="!isMinimal && showChatPanelButton"
|
*ngIf="!isMinimal && showChatPanelButton"
|
||||||
(click)="toggleChatPanel()"
|
(click)="toggleChatPanel()"
|
||||||
[disabled]="isConnectionLost"
|
[disabled]="isConnectionLost"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,201 @@
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright {yyyy} {name of copyright owner}
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
[](http://www.apache.org/licenses/LICENSE-2.0)
|
||||||
|
[](https://docs.openvidu.io/en/stable/?badge=stable)
|
||||||
|
[](https://hub.docker.com/r/openvidu/openvidu-server-kms)
|
||||||
|
[](https://openvidu.discourse.group/)
|
||||||
|
|
||||||
|
[![][OpenViduLogo]](http://openvidu.io)
|
||||||
|
|
||||||
|
webcomponent-e2e
|
||||||
|
===
|
||||||
|
|
||||||
|
[OpenViduLogo]: https://secure.gravatar.com/avatar/5daba1d43042f2e4e85849733c8e5702?s=120
|
||||||
|
|
||||||
|
|
||||||
|
### How to run it (localhost)
|
||||||
|
|
||||||
|
1) Start openvidu-server:
|
||||||
|
|
||||||
|
```
|
||||||
|
docker run -p 4443:4443 --rm -e OPENVIDU_SECRET=MY_SECRET openvidu/openvidu-server-kms:latest
|
||||||
|
```
|
||||||
|
|
||||||
|
2) _**Opnenning a new terminal**_, prepare webcomponent test.
|
||||||
|
|
||||||
|
Run the following command under the root directory (`openvidu/openvidu-webcomponent-angular/`)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run install
|
||||||
|
npm run webcomponent:prepare-test-e2e
|
||||||
|
```
|
||||||
|
|
||||||
|
3) Install test dependencies:
|
||||||
|
|
||||||
|
```nash
|
||||||
|
npm run install --prefix webcomponent-test-e2e
|
||||||
|
```
|
||||||
|
|
||||||
|
4) _**Opnenning a new terminal**_, Run the webcomponent app. By default, the app will start on `http://localhost:8080`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
http-server webcomponent-test-e2e/web
|
||||||
|
```
|
||||||
|
|
||||||
|
5) Run the E2E test:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run webcomponent:e2e
|
||||||
|
```
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"name": "webcomponent-test-e2e",
|
||||||
|
"version": "2.21.0",
|
||||||
|
"description": "E2E webcomponent test",
|
||||||
|
"main": "test.ts",
|
||||||
|
"scripts": {
|
||||||
|
"serve": "http-server web/",
|
||||||
|
"test": "tsc && mocha --recursive --timeout 30000 ./dist/test.js"
|
||||||
|
},
|
||||||
|
"author": "Carlos Santos Morales",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"chromedriver": "99.0.0",
|
||||||
|
"selenium-webdriver": "4.1.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/chai": "4.3.0",
|
||||||
|
"@types/mocha": "9.1.0",
|
||||||
|
"chai": "4.3.6",
|
||||||
|
"mocha": "9.2.2"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,689 @@
|
||||||
|
// require('chromedriver');
|
||||||
|
// const assert = require('assert');
|
||||||
|
// const webdriver = require('selenium-webdriver');
|
||||||
|
const chrome = require('selenium-webdriver/chrome');
|
||||||
|
// const firefox = require('selenium-webdriver/firefox');
|
||||||
|
// const { Builder, By, Key, promise, until } = require('selenium-webdriver');
|
||||||
|
|
||||||
|
import { Builder, By, Capabilities, until, WebDriver, logging, Key } from 'selenium-webdriver';
|
||||||
|
import { expect } from 'chai';
|
||||||
|
|
||||||
|
const url = 'http://127.0.0.1:8080/';
|
||||||
|
const FIVE_SECONDS = 5000;
|
||||||
|
const ONE_SECONDS = 5000;
|
||||||
|
const sleepTimeout = 500;
|
||||||
|
|
||||||
|
describe('Checkout localhost app', () => {
|
||||||
|
let browser: WebDriver;
|
||||||
|
|
||||||
|
const chromeOptions = new chrome.Options();
|
||||||
|
const chromeCapabilities = Capabilities.chrome();
|
||||||
|
|
||||||
|
chromeOptions.addArguments('--use-fake-ui-for-media-stream', '--use-fake-device-for-media-stream');
|
||||||
|
const prefs = new logging.Preferences();
|
||||||
|
prefs.setLevel(logging.Type.BROWSER, logging.Level.DEBUG);
|
||||||
|
chromeCapabilities.set('acceptInsecureCerts', true);
|
||||||
|
|
||||||
|
// var firefoxOptions = new firefox.Options();
|
||||||
|
// var firefoxCapabilities = webdriver.Capabilities.firefox();
|
||||||
|
// firefoxOptions.addArguments('--headless');
|
||||||
|
// firefoxOptions.setPreference('media.navigator.permission.disabled', true);
|
||||||
|
// firefoxOptions.setPreference('media.navigator.streams.fake', true);
|
||||||
|
// firefoxCapabilities.setAcceptInsecureCerts(true);
|
||||||
|
|
||||||
|
async function createChromeBrowser(name: string): Promise<WebDriver> {
|
||||||
|
return await new Builder().forBrowser(name).withCapabilities(chromeCapabilities).setChromeOptions(chromeOptions).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
// async function createFirefoxBrowser() {
|
||||||
|
// return await new Builder()
|
||||||
|
// .forBrowser('firefox')
|
||||||
|
// .withCapabilities(firefoxCapabilities)
|
||||||
|
// .setFirefoxOptions(firefoxOptions)
|
||||||
|
// .build();
|
||||||
|
|
||||||
|
// return await new Builder().forBrowser('chrome2').withCapabilities(chromeCapabilities).setChromeOptions(chromeOptions).build();
|
||||||
|
// }
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
browser = await createChromeBrowser('Chrome');
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await browser.quit();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ** API Directives
|
||||||
|
|
||||||
|
it('should set the MINIMAL UI', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?minimal=true`);
|
||||||
|
// Checking if prejoin page exist
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('prejoin-container')), ONE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if stream component is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.className('OT_widget-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if audio detection is not displayed
|
||||||
|
element = await browser.findElements(By.id('audio-wave-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
const joinButton = await browser.findElement(By.id('join-button'));
|
||||||
|
expect(await joinButton.isDisplayed()).to.be.true;
|
||||||
|
await joinButton.click();
|
||||||
|
|
||||||
|
// Checking if session container is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if screenshare button is not present
|
||||||
|
element = await browser.findElements(By.id('screenshare-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if fullscreen button is not present
|
||||||
|
element = await browser.findElements(By.id('fullscreen-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if participants panel button is not present
|
||||||
|
element = await browser.findElements(By.id('participants-panel-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if logo is not displayed
|
||||||
|
element = await browser.findElements(By.id('branding-logo'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if session name is not displayed
|
||||||
|
element = await browser.findElements(By.id('session-name'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if nickname is not displayed
|
||||||
|
element = await browser.findElements(By.id('nickname-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if audio detection is not displayed
|
||||||
|
element = await browser.findElements(By.id('audio-wave-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
|
||||||
|
// Checking if settings button is not displayed
|
||||||
|
element = await browser.findElements(By.id('settings-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should show the PREJOIN page', async () => {
|
||||||
|
await browser.get(`${url}?prejoin=true`);
|
||||||
|
const element = await browser.wait(until.elementLocated(By.id('prejoin-container')), ONE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
it('should not show the PREJOIN page', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), ONE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should run the app with VIDEO MUTED in prejoin page', async () => {
|
||||||
|
let element, isVideoEnabled, icon;
|
||||||
|
const videoEnableScript = 'return document.getElementsByTagName("video")[0].srcObject.getVideoTracks()[0].enabled;';
|
||||||
|
|
||||||
|
await browser.get(`${url}?prejoin=true&videoMuted=true`);
|
||||||
|
|
||||||
|
// Checking if video is displayed
|
||||||
|
await browser.wait(until.elementLocated(By.css('video')), FIVE_SECONDS);
|
||||||
|
element = await browser.findElement(By.css('video'));
|
||||||
|
await browser.wait(until.elementIsVisible(element), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if video track is disabled/muted
|
||||||
|
isVideoEnabled = await browser.executeScript(videoEnableScript);
|
||||||
|
expect(isVideoEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('videocam_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
const joinButton = await browser.findElement(By.id('join-button'));
|
||||||
|
expect(await joinButton.isDisplayed()).to.be.true;
|
||||||
|
await joinButton.click();
|
||||||
|
|
||||||
|
// Checking if video is muted after join the room
|
||||||
|
isVideoEnabled = await browser.executeScript(videoEnableScript);
|
||||||
|
expect(isVideoEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('videocam_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should run the app with VIDEO MUTED and WITHOUT PREJOIN page', async () => {
|
||||||
|
let element, isVideoEnabled, icon;
|
||||||
|
const videoEnableScript = 'return document.getElementsByTagName("video")[0].srcObject.getVideoTracks()[0].enabled;';
|
||||||
|
|
||||||
|
await browser.get(`${url}?prejoin=false&videoMuted=true`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), ONE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if video is displayed
|
||||||
|
await browser.wait(until.elementLocated(By.css('video')), FIVE_SECONDS);
|
||||||
|
element = await browser.findElement(By.css('video'));
|
||||||
|
await browser.wait(until.elementIsVisible(element), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if video track is disabled/muted
|
||||||
|
isVideoEnabled = await browser.executeScript(videoEnableScript);
|
||||||
|
expect(isVideoEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('videocam_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should run the app with AUDIO MUTED in prejoin page', async () => {
|
||||||
|
let element, isAudioEnabled, icon;
|
||||||
|
const audioEnableScript = 'return document.getElementsByTagName("video")[0].srcObject.getAudioTracks()[0].enabled;';
|
||||||
|
|
||||||
|
await browser.get(`${url}?audioMuted=true`);
|
||||||
|
|
||||||
|
// Checking if video is displayed
|
||||||
|
await browser.wait(until.elementLocated(By.css('video')), FIVE_SECONDS);
|
||||||
|
element = await browser.findElement(By.css('video'));
|
||||||
|
await browser.wait(until.elementIsVisible(element), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if audio track is disabled/muted
|
||||||
|
isAudioEnabled = await browser.executeScript(audioEnableScript);
|
||||||
|
expect(isAudioEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('mic_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
const joinButton = await browser.findElement(By.id('join-button'));
|
||||||
|
expect(await joinButton.isDisplayed()).to.be.true;
|
||||||
|
await joinButton.click();
|
||||||
|
|
||||||
|
// Checking if audio is muted after join the room
|
||||||
|
isAudioEnabled = await browser.executeScript(audioEnableScript);
|
||||||
|
expect(isAudioEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('mic_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should run the app with VIDEO MUTED and WITHOUT PREJOIN page', async () => {
|
||||||
|
let element, isAudioEnabled, icon;
|
||||||
|
const audioEnableScript = 'return document.getElementsByTagName("video")[0].srcObject.getAudioTracks()[0].enabled;';
|
||||||
|
|
||||||
|
await browser.get(`${url}?prejoin=false&audioMuted=true`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), ONE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if video is displayed
|
||||||
|
await browser.wait(until.elementLocated(By.css('video')), FIVE_SECONDS);
|
||||||
|
element = await browser.findElement(By.css('video'));
|
||||||
|
await browser.wait(until.elementIsVisible(element), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if audio track is disabled/muted
|
||||||
|
isAudioEnabled = await browser.executeScript(audioEnableScript);
|
||||||
|
expect(isAudioEnabled).to.be.false;
|
||||||
|
|
||||||
|
icon = await browser.findElement(By.id('mic_off'));
|
||||||
|
expect(await icon.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the SCREENSHARE button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&screenshareBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if screenshare button is not present
|
||||||
|
element = await browser.findElements(By.id('screenshare-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the FULLSCREEN button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&fullscreenBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if fullscreen button is not present
|
||||||
|
element = await browser.findElements(By.id('fullscreen-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the LEAVE button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&leaveBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if leave button is not present
|
||||||
|
element = await browser.findElements(By.id('leave-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the CHAT PANEL button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&chatPanelBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if chat panel button is not present
|
||||||
|
element = await browser.findElements(By.id('chat-panel-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the PARTICIPANTS PANEL button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&participantsPanelBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if participants panel button is not present
|
||||||
|
element = await browser.findElements(By.id('participants-panel-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the LOGO', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&displayLogo=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('info-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if logo is not displayed
|
||||||
|
element = await browser.findElements(By.id('branding-logo'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the SESSION NAME', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&displaySessionName=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('info-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if session name is not displayed
|
||||||
|
element = await browser.findElements(By.id('session-name'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the PARTICIPANT NAME', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&displayParticipantName=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if stream component is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.className('OT_widget-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if nickname is not displayed
|
||||||
|
element = await browser.findElements(By.id('nickname-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the AUDIO DETECTION element', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&displayAudioDetection=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if stream component is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.className('OT_widget-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if audio detection is not displayed
|
||||||
|
element = await browser.findElements(By.id('audio-wave-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the SETTINGS button', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false&settingsBtn=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if stream component is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.className('OT_widget-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if settings button is not displayed
|
||||||
|
element = await browser.findElements(By.id('settings-container'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should HIDE the MUTE button in participants panel', async () => {
|
||||||
|
let element, remoteParticipantItems;
|
||||||
|
const sessionName = 'e2etest';
|
||||||
|
const fixedUrl = `${url}?prejoin=false&participantMuteBtn=false&sessionName=${sessionName}`;
|
||||||
|
await browser.get(fixedUrl);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present and opening the participants panel
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('menu-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
const participantsButton = await browser.findElement(By.id('participants-panel-btn'));
|
||||||
|
await participantsButton.click();
|
||||||
|
|
||||||
|
// Checking if participatns panel is displayed
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('participants-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
// Checking remote participants item
|
||||||
|
remoteParticipantItems = await browser.findElements(By.id('remote-participant-item'));
|
||||||
|
expect(remoteParticipantItems.length).equals(0);
|
||||||
|
|
||||||
|
// Starting new browser for adding a new participant
|
||||||
|
const newTabScript = `window.open("${fixedUrl}")`;
|
||||||
|
await browser.executeScript(newTabScript);
|
||||||
|
|
||||||
|
// Go to first tab
|
||||||
|
const tabs = await browser.getAllWindowHandles();
|
||||||
|
browser.switchTo().window(tabs[0]);
|
||||||
|
|
||||||
|
// Checking if mute button is not displayed in participant item
|
||||||
|
remoteParticipantItems = await browser.wait(until.elementsLocated(By.id('remote-participant-item')), FIVE_SECONDS);
|
||||||
|
expect(remoteParticipantItems.length).equals(1);
|
||||||
|
element = await browser.findElements(By.id('mute-btn'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
//* ---- Webcomponent events ----
|
||||||
|
|
||||||
|
it('should receive the onJoinButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('prejoin-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to join button
|
||||||
|
const joinButton = await browser.findElement(By.id('join-button'));
|
||||||
|
expect(await joinButton.isDisplayed()).to.be.true;
|
||||||
|
await joinButton.click();
|
||||||
|
|
||||||
|
// Checking if onJoinButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onJoinButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onToolbarLeaveButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to leave button
|
||||||
|
const leaveButton = await browser.findElement(By.id('leave-btn'));
|
||||||
|
expect(await leaveButton.isDisplayed()).to.be.true;
|
||||||
|
await leaveButton.click();
|
||||||
|
|
||||||
|
// Checking if onToolbarLeaveButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onToolbarLeaveButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onToolbarCameraButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to leave button
|
||||||
|
const cameraButton = await browser.findElement(By.id('camera-btn'));
|
||||||
|
expect(await cameraButton.isDisplayed()).to.be.true;
|
||||||
|
await cameraButton.click();
|
||||||
|
|
||||||
|
// Checking if onToolbarCameraButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onToolbarCameraButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onToolbarMicrophoneButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to leave button
|
||||||
|
const cameraButton = await browser.findElement(By.id('mic-btn'));
|
||||||
|
expect(await cameraButton.isDisplayed()).to.be.true;
|
||||||
|
await cameraButton.click();
|
||||||
|
|
||||||
|
// Checking if onToolbarMicrophoneButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onToolbarMicrophoneButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onToolbarScreenshareButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to leave button
|
||||||
|
const screenshareButton = await browser.findElement(By.id('screenshare-btn'));
|
||||||
|
expect(await screenshareButton.isDisplayed()).to.be.true;
|
||||||
|
await screenshareButton.click();
|
||||||
|
|
||||||
|
// Checking if onToolbarScreenshareButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onToolbarScreenshareButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onToolbarFullscreenButtonClicked event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('session-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Checking if toolbar is present
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('media-buttons-container')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
|
||||||
|
// Clicking to leave button
|
||||||
|
const fullscreenButton = await browser.findElement(By.id('fullscreen-btn'));
|
||||||
|
expect(await fullscreenButton.isDisplayed()).to.be.true;
|
||||||
|
await fullscreenButton.click();
|
||||||
|
|
||||||
|
// Checking if onToolbarFullscreenButtonClicked has been received
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onToolbarFullscreenButtonClicked')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should receive the onSessionCreated event', async () => {
|
||||||
|
let element;
|
||||||
|
await browser.get(`${url}?prejoin=false`);
|
||||||
|
element = await browser.wait(until.elementLocated(By.id('onSessionCreated')), FIVE_SECONDS);
|
||||||
|
expect(await element.isDisplayed()).to.be.true;
|
||||||
|
element = await browser.findElements(By.id('onJoinButtonClicked'));
|
||||||
|
expect(element.length).equals(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// * PUBLISHER EVENTS
|
||||||
|
|
||||||
|
// it('should receive publisherCreated event', async () => {
|
||||||
|
// try {
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// it('should receive Publisher streamCreated event', async function () {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisher-streamCreated')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// it('should receive Publisher streamPlaying event', async function () {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisher-streamPlaying')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// * SESSION EVENTS
|
||||||
|
|
||||||
|
// it('should receive REMOTE connectionCreated event', async () => {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// browser2 = await createFirefoxBrowser();
|
||||||
|
// await browser2.get(url);
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
// await browser2.sleep(sleepTimeout);
|
||||||
|
// var user2 = await (await browser2.wait(until.elementLocated(By.id('nickname')), FIVE_SECONDS)).getText();
|
||||||
|
// await browser.wait(until.elementLocated(By.id(user2 + '-connectionCreated')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// await browser2.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// it('should receive REMOTE streamDestroyed event', async function () {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// browser2 = await createFirefoxBrowser();
|
||||||
|
// await browser2.get(url);
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('publisher-streamPlaying')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser2.sleep(sleepTimeout);
|
||||||
|
// var user2 = await (await browser2.wait(until.elementLocated(By.id('nickname')), FIVE_SECONDS)).getText();
|
||||||
|
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id(user2 + '-streamDestroyed')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// await browser2.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// it('should receive Session sessionDisconnected event', async function () {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisher-streamPlaying')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser.sleep(sleepTimeout);
|
||||||
|
// var user = await (await browser.wait(until.elementLocated(By.id('nickname')), FIVE_SECONDS)).getText();
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id(user + '-sessionDisconnected')), FIVE_SECONDS);
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
// it('should receive REMOTE streamCreated event', async function () {
|
||||||
|
// try {
|
||||||
|
// // await browser.get(url);
|
||||||
|
// await browser.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// browser2 = await createFirefoxBrowser();
|
||||||
|
// await browser2.get(url);
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('publisherCreated')), FIVE_SECONDS);
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('publisher-streamPlaying')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser2.sleep(sleepTimeout);
|
||||||
|
// var user2 = await (await browser2.wait(until.elementLocated(By.id('nickname')), FIVE_SECONDS)).getText();
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id(user2 + '-streamCreated')), FIVE_SECONDS);
|
||||||
|
|
||||||
|
// await browser2.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
|
||||||
|
// await browser.wait(until.elementLocated(By.id('navLeaveButton')), FIVE_SECONDS).click();
|
||||||
|
// } catch (error) {
|
||||||
|
// console.log(error);
|
||||||
|
// } finally {
|
||||||
|
// await browser.quit();
|
||||||
|
// await browser2.quit();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es6",
|
||||||
|
"module": "commonjs",
|
||||||
|
"strict": true,
|
||||||
|
"outDir": "./dist",
|
||||||
|
"lib": [
|
||||||
|
"es6"
|
||||||
|
],
|
||||||
|
"types": [ "mocha", "node" ],
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"emitDecoratorMetadata": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,217 @@
|
||||||
|
|
||||||
|
var MINIMAL;
|
||||||
|
var PREJOIN;
|
||||||
|
var VIDEO_MUTED;
|
||||||
|
var AUDIO_MUTED;
|
||||||
|
|
||||||
|
var SCREENSHARE_BUTTON;
|
||||||
|
var FULLSCREEN_BUTTON;
|
||||||
|
var CHAT_PANEL_BUTTON;
|
||||||
|
var DISPLAY_LOGO;
|
||||||
|
var DISPLAY_SESSION_NAME;
|
||||||
|
var DISPLAY_PARTICIPANT_NAME;
|
||||||
|
var DISPLAY_AUDIO_DETECTION;
|
||||||
|
var SETTINGS_BUTTON;
|
||||||
|
var LEAVE_BUTTON;
|
||||||
|
var PARTICIPANT_MUTE_BUTTON;
|
||||||
|
var PARTICIPANTS_PANEL_BUTTON;
|
||||||
|
|
||||||
|
var SESSION_NAME;
|
||||||
|
|
||||||
|
$(document).ready(() => {
|
||||||
|
|
||||||
|
var url = new URL(window.location.href);
|
||||||
|
MINIMAL = url.searchParams.get("minimal") === null ? false : url.searchParams.get("minimal") === 'true';
|
||||||
|
PREJOIN = url.searchParams.get("prejoin") === null ? true : url.searchParams.get("prejoin") === 'true';
|
||||||
|
VIDEO_MUTED = url.searchParams.get("videoMuted") === null ? false : url.searchParams.get("videoMuted") === 'true';
|
||||||
|
console.log("video muted", url.searchParams.get("videoMuted"));
|
||||||
|
AUDIO_MUTED = url.searchParams.get("audioMuted") === null ? false : url.searchParams.get("audioMuted") === 'true';
|
||||||
|
SCREENSHARE_BUTTON = url.searchParams.get("screenshareBtn") === null ? true : url.searchParams.get("screenshareBtn") === 'true';
|
||||||
|
FULLSCREEN_BUTTON = url.searchParams.get("fullscreenBtn") === null ? true : url.searchParams.get("fullscreenBtn") === 'true';
|
||||||
|
LEAVE_BUTTON = url.searchParams.get("leaveBtn") === null ? true : url.searchParams.get("leaveBtn") === 'true';
|
||||||
|
CHAT_PANEL_BUTTON = url.searchParams.get("chatPanelBtn") === null ? true : url.searchParams.get("chatPanelBtn") === 'true';
|
||||||
|
PARTICIPANTS_PANEL_BUTTON = url.searchParams.get("participantsPanelBtn") === null ? true : url.searchParams.get("participantsPanelBtn") === 'true';
|
||||||
|
|
||||||
|
DISPLAY_LOGO = url.searchParams.get("displayLogo") === null ? true : url.searchParams.get("displayLogo") === 'true';
|
||||||
|
DISPLAY_SESSION_NAME = url.searchParams.get("displaySessionName") === null ? true : url.searchParams.get("displaySessionName") === 'true';
|
||||||
|
DISPLAY_PARTICIPANT_NAME = url.searchParams.get("displayParticipantName") === null ? true : url.searchParams.get("displayParticipantName") === 'true';
|
||||||
|
DISPLAY_AUDIO_DETECTION = url.searchParams.get("displayAudioDetection") === null ? true : url.searchParams.get("displayAudioDetection") === 'true';
|
||||||
|
SETTINGS_BUTTON = url.searchParams.get("settingsBtn") === null ? true : url.searchParams.get("settingsBtn") === 'true';
|
||||||
|
PARTICIPANT_MUTE_BUTTON = url.searchParams.get("participantMuteBtn") === null ? true : url.searchParams.get("participantMuteBtn") === 'true';
|
||||||
|
|
||||||
|
|
||||||
|
SESSION_NAME = url.searchParams.get("sessionName") === null ? `E2ESession${Math.floor(Math.random()*100)}` : url.searchParams.get("sessionName");
|
||||||
|
|
||||||
|
var webComponent = document.querySelector('openvidu-webcomponent');
|
||||||
|
|
||||||
|
webComponent.addEventListener('onJoinButtonClicked', (event) => appendElement('onJoinButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarLeaveButtonClicked', (event) => appendElement('onToolbarLeaveButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarCameraButtonClicked', (event) => appendElement('onToolbarCameraButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarMicrophoneButtonClicked', (event) => appendElement('onToolbarMicrophoneButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarScreenshareButtonClicked', (event) => appendElement('onToolbarScreenshareButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarParticipantsPanelButtonClicked', (event) => appendElement('onToolbarParticipantsPanelButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarChatPanelButtonClicked', (event) => appendElement('onToolbarChatPanelButtonClicked'));
|
||||||
|
webComponent.addEventListener('onToolbarFullscreenButtonClicked', (event) => appendElement('onToolbarFullscreenButtonClicked'));
|
||||||
|
|
||||||
|
webComponent.addEventListener('onSessionCreated', (event) => {
|
||||||
|
var session = event.detail;
|
||||||
|
appendElement('onSessionCreated');
|
||||||
|
|
||||||
|
|
||||||
|
// You can see the session documentation here
|
||||||
|
// https://docs.openvidu.io/en/stable/api/openvidu-browser/classes/session.html
|
||||||
|
|
||||||
|
// session.on('connectionCreated', (e) => {
|
||||||
|
// console.error("connectionCreated", e);
|
||||||
|
// var user = JSON.parse(e.connection.data).clientData;
|
||||||
|
// appendElement(user + '-connectionCreated');
|
||||||
|
// });
|
||||||
|
|
||||||
|
// session.on('streamDestroyed', (e) => {
|
||||||
|
// console.log("streamDestroyed", e);
|
||||||
|
// var user = JSON.parse(e.stream.connection.data).clientData;
|
||||||
|
// appendElement(user + '-streamDestroyed');
|
||||||
|
// });
|
||||||
|
|
||||||
|
// session.on('streamCreated', (e) => {
|
||||||
|
// console.log("streamCreated", e);
|
||||||
|
// var user = JSON.parse(e.stream.connection.data).clientData;
|
||||||
|
// appendElement(user + '-streamCreated');
|
||||||
|
// });
|
||||||
|
|
||||||
|
// session.on('sessionDisconnected', (e) => {
|
||||||
|
// console.warn("sessionDisconnected ", e);
|
||||||
|
// var user = JSON.parse(e.target.connection.data).clientData;
|
||||||
|
// appendElement(user + '-sessionDisconnected');
|
||||||
|
// });
|
||||||
|
});
|
||||||
|
|
||||||
|
webComponent.addEventListener('publisherCreated', (event) => {
|
||||||
|
var publisher = event.detail;
|
||||||
|
appendElement('publisherCreated')
|
||||||
|
|
||||||
|
// You can see the publisher documentation here
|
||||||
|
// https://docs.openvidu.io/en/stable/api/openvidu-browser/classes/publisher.html
|
||||||
|
|
||||||
|
publisher.on('streamCreated', (e) => {
|
||||||
|
console.warn("Publisher streamCreated", e);
|
||||||
|
appendElement('publisher-streamCreated');
|
||||||
|
});
|
||||||
|
|
||||||
|
publisher.on('streamPlaying', (e) => {
|
||||||
|
appendElement('publisher-streamPlaying');
|
||||||
|
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
webComponent.addEventListener('error', (event) => {
|
||||||
|
console.log('Error event', event.detail);
|
||||||
|
});
|
||||||
|
|
||||||
|
var user = 'user' + Math.floor(Math.random() * 100);
|
||||||
|
joinSession(SESSION_NAME, user);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
function appendElement(id) {
|
||||||
|
var eventsDiv = document.getElementById('events');
|
||||||
|
var element = document.createElement('div');
|
||||||
|
element.setAttribute("id", id);
|
||||||
|
element.setAttribute("style", "height: 1px;");
|
||||||
|
eventsDiv.appendChild(element);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function joinSession(sessionName, participantName) {
|
||||||
|
var webComponent = document.querySelector('openvidu-webcomponent');
|
||||||
|
var tokens = {webcam: await getToken(sessionName), screen: await getToken(sessionName)};
|
||||||
|
|
||||||
|
webComponent.minimal = MINIMAL;
|
||||||
|
webComponent.prejoin = PREJOIN;
|
||||||
|
webComponent.videoMuted = VIDEO_MUTED;
|
||||||
|
webComponent.audioMuted = AUDIO_MUTED;
|
||||||
|
webComponent.toolbarScreenshareButton = SCREENSHARE_BUTTON;
|
||||||
|
|
||||||
|
webComponent.toolbarFullscreenButton = FULLSCREEN_BUTTON;
|
||||||
|
webComponent.toolbarLeaveButton = LEAVE_BUTTON;
|
||||||
|
webComponent.toolbarChatPanelButton = CHAT_PANEL_BUTTON;
|
||||||
|
webComponent.toolbarParticipantsPanelButton = PARTICIPANTS_PANEL_BUTTON;
|
||||||
|
webComponent.toolbarDisplayLogo = DISPLAY_LOGO;
|
||||||
|
webComponent.toolbarDisplaySessionName = DISPLAY_SESSION_NAME;
|
||||||
|
webComponent.streamDisplayParticipantName = DISPLAY_PARTICIPANT_NAME;
|
||||||
|
webComponent.streamDisplayAudioDetection = DISPLAY_AUDIO_DETECTION;
|
||||||
|
webComponent.streamSettingsButton = SETTINGS_BUTTON;
|
||||||
|
webComponent.participantPanelItemMuteButton = PARTICIPANT_MUTE_BUTTON;
|
||||||
|
|
||||||
|
webComponent.sessionConfig = { sessionName, participantName, tokens };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* --------------------------
|
||||||
|
* SERVER-SIDE RESPONSIBILITY
|
||||||
|
* --------------------------
|
||||||
|
* These methods retrieve the mandatory user token from OpenVidu Server.
|
||||||
|
* This behavior MUST BE IN YOUR SERVER-SIDE IN PRODUCTION (by using
|
||||||
|
* the API REST, openvidu-java-client or openvidu-node-client):
|
||||||
|
* 1) Initialize a session in OpenVidu Server (POST /api/sessions)
|
||||||
|
* 2) Generate a token in OpenVidu Server (POST /api/tokens)
|
||||||
|
* 3) Configure OpenVidu Web Component in your client side with the token
|
||||||
|
*/
|
||||||
|
|
||||||
|
var OPENVIDU_SERVER_URL = "https://localhost:4443" ;
|
||||||
|
var OPENVIDU_SERVER_SECRET = 'MY_SECRET';
|
||||||
|
|
||||||
|
function getToken(sessionName) {
|
||||||
|
return createSession(sessionName).then((sessionId) => createToken(sessionId));
|
||||||
|
}
|
||||||
|
|
||||||
|
function createSession(sessionName) { // See https://docs.openvidu.io/en/stable/reference-docs/REST-API/#post-apisessions
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: OPENVIDU_SERVER_URL + '/api/sessions',
|
||||||
|
data: JSON.stringify({ customSessionId: sessionName }),
|
||||||
|
headers: {
|
||||||
|
Authorization: 'Basic ' + btoa('OPENVIDUAPP:' + OPENVIDU_SERVER_SECRET),
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
success: (response) => resolve(response.id),
|
||||||
|
error: (error) => {
|
||||||
|
if (error.status === 409) {
|
||||||
|
resolve(sessionName);
|
||||||
|
} else {
|
||||||
|
console.warn('No connection to OpenVidu Server. This may be a certificate error at ' + OPENVIDU_SERVER_URL);
|
||||||
|
if (
|
||||||
|
window.confirm(
|
||||||
|
'No connection to OpenVidu Server. This may be a certificate error at "' +
|
||||||
|
OPENVIDU_SERVER_URL +
|
||||||
|
'"\n\nClick OK to navigate and accept it. ' +
|
||||||
|
'If no certificate warning is shown, then check that your OpenVidu Server is up and running at "' +
|
||||||
|
OPENVIDU_SERVER_URL +
|
||||||
|
'"',
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
location.assign(OPENVIDU_SERVER_URL + '/accept-certificate');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function createToken(sessionId) {
|
||||||
|
// See https://docs.openvidu.io/en/stable/reference-docs/REST-API/#post-apitokens
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: OPENVIDU_SERVER_URL + '/api/tokens',
|
||||||
|
data: JSON.stringify({ session: sessionId }),
|
||||||
|
headers: {
|
||||||
|
Authorization: 'Basic ' + btoa('OPENVIDUAPP:' + OPENVIDU_SERVER_SECRET),
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
success: (response) => resolve(response.token),
|
||||||
|
error: (error) => reject(error),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
|
|
@ -0,0 +1,45 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<title>openvidu-web-component</title>
|
||||||
|
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
|
||||||
|
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
|
||||||
|
crossorigin="anonymous"></script>
|
||||||
|
|
||||||
|
<script src="app.js"></script>
|
||||||
|
<script src="openvidu-webcomponent-dev.js"></script>
|
||||||
|
<link rel="stylesheet" href="openvidu-webcomponent-dev.css">
|
||||||
|
|
||||||
|
<style>
|
||||||
|
|
||||||
|
:root {
|
||||||
|
--ov-primary-color: #303030;
|
||||||
|
--ov-secondary-color: #586063;
|
||||||
|
--ov-tertiary-color: #598eff;
|
||||||
|
--ov-warn-color: #EB5144;
|
||||||
|
--ov-accent-color: #ffae35;
|
||||||
|
|
||||||
|
--ov-dark-color: #1d1d1d;
|
||||||
|
--ov-dark-light-color: #43484A;
|
||||||
|
|
||||||
|
--ov-light-color: #ffffff;
|
||||||
|
--ov-light-dark-color: #f1f1f1;
|
||||||
|
|
||||||
|
--ov-buttons-radius: 50%;
|
||||||
|
--ov-leave-button-radius: 10px;
|
||||||
|
--ov-video-radius: 5px;
|
||||||
|
--ov-panel-radius: 5px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<div id="events"></div>
|
||||||
|
<!-- OpenVidu Web Component -->
|
||||||
|
<openvidu-webcomponent></openvidu-webcomponent>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
Loading…
Reference in New Issue