diff --git a/tests/Feature/Console/Commands/InsertSmilAssetsTest.php b/tests/Feature/Console/Commands/InsertSmilAssetsTest.php
index f23ade84..627b73ed 100644
--- a/tests/Feature/Console/Commands/InsertSmilAssetsTest.php
+++ b/tests/Feature/Console/Commands/InsertSmilAssetsTest.php
@@ -4,8 +4,6 @@
use Facades\Tests\Setup\ClipFactory;
use Illuminate\Support\Facades\Storage;
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
-
it('shows a message if smil is created', function () {
$clip = ClipFactory::withAssets(4)->create();
@@ -17,13 +15,11 @@
$clip = ClipFactory::withAssets(4)->create();
- expect($clip->assets()->count())->toEqual(4);
+ expect($clip->assets()->count())->toEqual(5);
$this->artisan('smil:insert');
$smil = $clip->getAssetsByType(Content::SMIL)->first();
$this->assertDatabaseHas('assets', ['id' => $smil->id]);
-
- Storage::disk('videos')->assertExists($smil->path.$smil->original_file_name);
});
diff --git a/tests/Feature/Http/Controllers/Backend/AssetsDestroyTest.php b/tests/Feature/Http/Controllers/Backend/AssetsDestroyTest.php
index 2f22858a..a2abc35f 100644
--- a/tests/Feature/Http/Controllers/Backend/AssetsDestroyTest.php
+++ b/tests/Feature/Http/Controllers/Backend/AssetsDestroyTest.php
@@ -25,10 +25,10 @@
test('a moderator can delete an owned clip asset', function () {
$clip = ClipFactory::withAssets(1)->ownedBy(signInRole(Role::MODERATOR))->create();
- expect($clip->assets->count())->toBe(1);
+ expect($clip->assets->count())->toBe(2); // it will create also the smil file for the video
delete(route('assets.destroy', $clip->assets()->first()))->assertRedirect(route('clips.edit', $clip));
- expect($clip->assets()->count())->toBe(0);
+ expect($clip->assets()->count())->toBe(1);
});
test('deleting an asset should also delete the file from storage', function () {
diff --git a/tests/Feature/Http/Controllers/Frontend/AccessTest.php b/tests/Feature/Http/Controllers/Frontend/AccessTest.php
index 9b100364..66196ceb 100644
--- a/tests/Feature/Http/Controllers/Frontend/AccessTest.php
+++ b/tests/Feature/Http/Controllers/Frontend/AccessTest.php
@@ -14,16 +14,16 @@
it('a clip with a portal acl can be only be accessable for logged in users', function () {
$this->clip->addAcls(collect([Acl::PORTAL()]));
- get(route('frontend.clips.show', $this->clip))->assertDontSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertDontSee('player-container');
signIn();
- get(route('frontend.clips.show', $this->clip))->assertSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertSee('player-container');
});
it('a clip with lms acl can be only accessable for lms users', function () {
$this->clip->addAcls(collect([Acl::LMS()]));
$client = getUrlClientType(Acl::LMS->lower());
- get(route('frontend.clips.show', $this->clip))->assertDontSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertDontSee('player-container');
$time = dechex(time());
$token = md5('clip'.'1'.$this->clip->password.'0.0.0.0'.$time.$client);
@@ -33,29 +33,29 @@
$token = md5('clip'.'1'.$this->clip->password.'127.0.0.1'.$time.$client);
$link = '/protector/link/clip/1/'.$token.'/'.$time.'/'.$client;
get($link)->assertStatus(302);
- get(route('frontend.clips.show', $this->clip))->assertSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertSee('player-container');
});
it('a clip with lms acl can be accessable for clip admin', function () {
$this->clip->addAcls(collect([Acl::LMS()]));
- get(route('frontend.clips.show', $this->clip))->assertDontSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertDontSee('player-container');
signIn($this->clip->owner);
- get(route('frontend.clips.show', $this->clip))->assertSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertSee('player-container');
});
it('a clip with lms acl can be accessable for portal admin ', function () {
$this->clip->addAcls(collect([Acl::LMS()]));
- get(route('frontend.clips.show', $this->clip))->assertDontSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertDontSee('player-container');
signInRole(Role::ADMIN);
- get(route('frontend.clips.show', $this->clip))->assertSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertSee('player-container');
});
it('a clip with lms acl can be accessable for portal superadmin ', function () {
$this->clip->addAcls(collect([Acl::LMS()]));
- get(route('frontend.clips.show', $this->clip))->assertDontSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertDontSee('player-container');
signInRole(Role::SUPERADMIN);
- get(route('frontend.clips.show', $this->clip))->assertSee('plyr-tides');
+ get(route('frontend.clips.show', $this->clip))->assertSee('player-container');
});
diff --git a/tests/Feature/Http/Controllers/Frontend/ClipTest.php b/tests/Feature/Http/Controllers/Frontend/ShowClipsTest.php
similarity index 73%
rename from tests/Feature/Http/Controllers/Frontend/ClipTest.php
rename to tests/Feature/Http/Controllers/Frontend/ShowClipsTest.php
index fdf301f8..c2b4bad4 100644
--- a/tests/Feature/Http/Controllers/Frontend/ClipTest.php
+++ b/tests/Feature/Http/Controllers/Frontend/ShowClipsTest.php
@@ -1,7 +1,9 @@
mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
get(route('frontend.clips.show', $this->clip->id))->assertOk()->assertSee($this->clip->title);
});
it('a guest cannot access frontend clip page if clip is not public', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$this->clip->is_public = false;
$this->clip->save();
@@ -67,7 +69,7 @@
});
it('a clip owner can access frontend clip page if clip has no assets', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$emptyClip = ClipFactory::withAssets(0)->create();
signIn($emptyClip->owner);
@@ -75,14 +77,14 @@
});
it('a portal admin can access frontend clip page if clip has no assets', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
signInRole(Role::ADMIN);
get(route('frontend.clips.show', ClipFactory::withAssets(0)->create()))->assertOk();
});
it('a clip owner can access frontend clip page if clip is not public visible', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$clip = ClipFactory::ownedBy(signIn())->create(['is_public' => false]);
signIn($clip->owner);
@@ -90,7 +92,7 @@
});
it('a portal admin can access frontend clip page if clip is not public visible', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$clip = ClipFactory::create(['is_public' => false]);
signInRole(Role::ADMIN);
@@ -106,7 +108,7 @@
});
it('a clip owner can access frontend clip page that belongs to series that it is not public ', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$user = signIn();
$series = SeriesFactory::notPublic()->create();
$this->clip->series_id = $series->id;
@@ -117,7 +119,7 @@
});
it('player in clip public page is using wowza url if wowza server is available', function () {
- $this->mockHandler->append($this->mockCheckApiConnection());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
get(route('frontend.clips.show', $this->clip))->assertSee(env('WOWZA_ENGINE_URL'));
});
@@ -129,26 +131,26 @@
});
it('clip edit button in clip public page is hidden for guests', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
signIn();
get(route('frontend.clips.show', $this->clip))->assertDontSee('Back to edit page');
});
it('clip comments in clip public page are hidden for guests', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
get(route('frontend.clips.show', $this->clip))->assertDontSee('Comments');
});
it('clip public page has a feeds button', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
get(route('frontend.clips.show', $this->clip))->assertSee('Feeds');
});
it('clip public page should display tags if a clip has any', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
get(route('frontend.clips.show', $this->clip))->assertDontSee('Tags');
$this->clip->addTags(collect(['single tag', 'tides', 'testTags']));
@@ -156,7 +158,7 @@
});
it('clip public page should display a series title and link if clip belongs to a series', function () {
- $this->mockHandler->append(new Response(), new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$series = SeriesFactory::create();
get(route('frontend.clips.show', $this->clip))->assertDontSee($series->title);
@@ -169,19 +171,39 @@
get(route('frontend.clips.show', $this->clip))->assertSee(route('frontend.series.show', $series));
});
+it('clip public page should display all alternative videos if a video has assets', function () {
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
+
+ Asset::factory()->create([
+ 'original_file_name' => 'presentation.smil',
+ 'type' => Content::SMIL,
+ 'clip_id' => $this->clip->id,
+ ]);
+ Asset::factory()->create([
+ 'original_file_name' => 'composite.smil',
+ 'type' => Content::SMIL,
+ 'clip_id' => $this->clip->id,
+ ]);
+ get(route('frontend.clips.show', $this->clip))
+ ->assertSee('presenter video stream')
+ ->assertSee('presentation video stream')
+ ->assertSee('composite video stream');
+});
+
it('clip public page should display clip presenters if any ', function () {
- $this->mockHandler->append(new Response(), new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$presenters = Presenter::factory(2)->create();
get(route('frontend.clips.show', $this->clip))->assertDontSee('Tags');
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$this->clip->addPresenters($presenters);
get(route('frontend.clips.show', $this->clip))
->assertSee(Presenter::find(1)->getFullNameAttribute(), Presenter::find(2)->getFullNameAttribute());
});
it('clip public page should have navidate to previous and next clips if a clip belongs to a series', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
SeriesFactory::withClips(3)->withAssets(2)->create();
$clip = Clip::find(3);
$previousClip = Clip::find(2);
@@ -195,7 +217,7 @@
});
it('a signed in user can access frontend clip page if clip has a portal access', function () {
- $this->mockHandler->append(new Response());
+ $this->mockHandler->append($this->mockCheckApiConnection(), $this->mockVodSecureUrls());
$this->clip->addAcls(collect([Acl::PORTAL()]));
get($this->clip->path())->assertDontSee('plyr-player');
diff --git a/tests/Setup/ClipFactory.php b/tests/Setup/ClipFactory.php
index a9fdbb69..17dd1550 100644
--- a/tests/Setup/ClipFactory.php
+++ b/tests/Setup/ClipFactory.php
@@ -2,6 +2,7 @@
namespace Tests\Setup;
+use App\Enums\Content;
use App\Models\Asset;
use App\Models\Clip;
use App\Models\User;
@@ -33,9 +34,16 @@ public function create(array $attributes = [])
]
);
- Asset::factory($this->assetsCount)->create([
- 'clip_id' => $clip->id,
- ]);
+ if ($this->assetsCount > 0) {
+ Asset::factory($this->assetsCount)->create([
+ 'clip_id' => $clip->id,
+ ]);
+ Asset::factory()->create([
+ 'original_file_name' => 'presenter.smil',
+ 'type' => Content::SMIL,
+ 'clip_id' => $clip->id,
+ ]);
+ }
return $clip;
}
diff --git a/tests/Setup/WorksWithWowzaClient.php b/tests/Setup/WorksWithWowzaClient.php
index 9163ffc8..a9af421c 100644
--- a/tests/Setup/WorksWithWowzaClient.php
+++ b/tests/Setup/WorksWithWowzaClient.php
@@ -31,4 +31,15 @@ public function mockCheckApiConnection(): Response
'0' => 'Wowza Streaming Engine X Perpetual Edition X.X.X.xxx buildYYYVERSION',
]));
}
+
+ public function mockVodSecureUrls(): Response
+ {
+ $urls = collect([
+ 'presenter' => 'localhost:9200/__def_inst/videoportal/presenter.smil',
+ 'presentation' => 'localhost:9200/__def_inst/videoportal/presentation.smil',
+ 'composite' => 'localhost:9200/__def_inst/videoportal/composite.smil',
+ ]);
+
+ return new Response(200, [], json_encode([$urls]));
+ }
}
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index 646e9fa2..30b0ac22 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -5,7 +5,6 @@
use App\Models\Clip;
use App\Models\Series;
use App\Models\User;
-use App\Services\WowzaService;
use Facades\Tests\Setup\ClipFactory;
use Facades\Tests\Setup\FileFactory;
use Illuminate\Support\Facades\Storage;
@@ -25,15 +24,6 @@
expect(fetchClipPoster('preview_image.png'))->toBe('/thumbnails/previews-ng/preview_image.png');
});
-it('returns a smil file for a clip', function () {
- Storage::fake('videos');
- $wowzaService = app(WowzaService::class);
- $wowzaService->createSmilFile($clip = ClipFactory::withAssets(2)->create(['created_at' => '01.01.2022']));
-
- expect(getClipSmilFile($clip, false))
- ->toBe('http://172.17.0.2:1935/vod/_definst_/2022/01/01/TIDES_ClipID_1/presenter.smil/playlist.m3u8');
-});
-
it('has a getClipStoragePath helper function for returning clip\'s date path', function () {
expect(getClipStoragePath(Clip::factory()->create(['created_at' => '2021-01-13 15:38:51'])))
->toBe('/2021/01/13/TIDES_ClipID_1/');
' +
- "
' +
+ '