Skip to content

Commit

Permalink
conclude merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanTGold committed Jan 23, 2024
2 parents 6a89815 + 8989b26 commit f50d619
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 18 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/run_canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
branches:
- master
- patch-version
paths-ignore:
- '.github/workflows/**'

workflow_dispatch:
inputs:
Expand All @@ -24,4 +26,4 @@ jobs:
player-type: "ovp tv"
schema-type: "playerV3Versions"
tests-yarn-run-to-execute: 'build lint type-check test'
yarn-upgrade-list: "@playkit-js/[email protected] @playkit-js/playkit-js-dash@canary @playkit-js/playkit-js-hls@canary @playkit-js/playkit-js-ui@canary @playkit-js/playkit-js-providers@canary"
yarn-upgrade-list: ""
2 changes: 1 addition & 1 deletion .github/workflows/run_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
player-type: "ovp tv"
schema-type: "playerV3Versions"
tests-yarn-run-to-execute: 'build lint type-check test'
yarn-upgrade-list: "@playkit-js/playkit-js @playkit-js/playkit-js-dash @playkit-js/playkit-js-hls @playkit-js/playkit-js-ui @playkit-js/playkit-js-providers"
yarn-upgrade-list: ""

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### 3.17.8 (2024-01-21)

### 3.17.7 (2024-01-07)

### 3.17.6 (2024-01-07)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
## License

This project is licensed under the AGPL-3.0 License - see the [LICENSE](LICENSE) file for details

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@playkit-js/kaltura-player-js",
"version": "3.17.7",
"version": "3.17.8",
"keywords": [
"kaltura",
"player",
Expand Down
66 changes: 51 additions & 15 deletions tests/e2e/common/playlist/playlist-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,19 @@ describe('PlaylistManager', () => {

it('should play next on ended when auto continue is true', (done) => {
let eventCounter = 0;
kalturaPlayer._eventManager.listen(kalturaPlayer, kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED, () => {
eventCounter++;
if (eventCounter === 2) {
done();
kalturaPlayer._eventManager.listen(
kalturaPlayer,
kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED,
() => {
eventCounter++;
if (eventCounter === 2) {
return done();
}
playlistManager._options.autoContinue = true;
playlistManager._playerOptions.ui.disable = true;
kalturaPlayer.dispatchEvent(
new FakeEvent(kalturaPlayer.Event.Core.PLAYBACK_ENDED)
);
}
playlistManager._options.autoContinue = true;
playlistManager._playerOptions.ui.disable = true;
Expand All @@ -125,10 +134,20 @@ describe('PlaylistManager', () => {

it('should play next on ended when loop is true', (done) => {
let eventCounter = 0;
kalturaPlayer._eventManager.listen(kalturaPlayer, kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED, () => {
eventCounter++;
if (eventCounter === 2) {
done();
kalturaPlayer._eventManager.listen(
kalturaPlayer,
kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED,
() => {
eventCounter++;
if (eventCounter === 2) {
return done();
}
playlistManager._options.autoContinue = false;
playlistManager._options.loop = true;
playlistManager._playerOptions.ui.disable = true;
kalturaPlayer.dispatchEvent(
new FakeEvent(kalturaPlayer.Event.Core.PLAYBACK_ENDED)
);
}
playlistManager._options.autoContinue = false;
playlistManager._options.loop = true;
Expand Down Expand Up @@ -162,10 +181,21 @@ describe('PlaylistManager', () => {

it('should play next on ended when ui is enabled but countdown is hidden', (done) => {
let eventCounter = 0;
kalturaPlayer._eventManager.listen(kalturaPlayer, kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED, () => {
eventCounter++;
if (eventCounter === 2) {
done();
kalturaPlayer._eventManager.listen(
kalturaPlayer,
kalturaPlayer.Event.Playlist.PLAYLIST_ITEM_CHANGED,
() => {
eventCounter++;
if (eventCounter === 2) {
return done();
}
playlistManager._options.autoContinue = true;
playlistManager._options.loop = true;
playlistManager._playerOptions.ui.disable = false;
playlistManager._countdown.showing = false;
kalturaPlayer.dispatchEvent(
new FakeEvent(kalturaPlayer.Event.Core.PLAYBACK_ENDED)
);
}
playlistManager._options.autoContinue = true;
playlistManager._options.loop = true;
Expand Down Expand Up @@ -528,9 +558,15 @@ describe('PlaylistManager', () => {

it.skip('should call playNext programmatically', (done) => {
let eventCounter = 0;
kalturaPlayer._eventManager.listen(kalturaPlayer, PlaylistEventType.PLAYLIST_ITEM_CHANGED, () => {
if (eventCounter === 2) {
done();
kalturaPlayer._eventManager.listen(
kalturaPlayer,
PlaylistEventType.PLAYLIST_ITEM_CHANGED,
() => {
if (eventCounter === 2) {
return done();
}
eventCounter++;
playlistManager.playNext();
}
eventCounter++;
playlistManager.playNext();
Expand Down

0 comments on commit f50d619

Please sign in to comment.