use custom baseUrl for Clappr Player in tests

app/assets/javascripts/play_previous_recordings.js

@@ -1,24 +0,0 @@
-$(document).on("click", "[data-behavior=play_recording]", function() {
-  if ($(this).hasClass('active')){
-    return false;
-  }
-
-  var playback_url = $(this).attr("data-playback-url")
-  $("#broadcast_video").empty();
-
-  new Clappr.Player({
-    parentId: '#broadcast_video',
-    source: playback_url,
-    width: '100%',
-    height: '100%',
-    autoPlay: true
-  });
-
-  $(".dropdown-menu").children().removeClass('active');
-  $(".dropdown-menu").children().children('i').remove();
-  $(this).siblings().removeClass('active');
-  $(this).siblings().children("i").remove();
-  $(this).addClass('active');
-  $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});
-

app/assets/javascripts/play_previous_recordings.js.erb

@@ -0,0 +1,26 @@
+$(document).on("click", "[data-behavior=play_recording]", function() {
+    if ($(this).hasClass('active')){
+        return false;
+    }
+
+    console.warn('Play prev : ', playback_url);
+
+    var playback_url = $(this).attr("data-playback-url")
+    $("#broadcast_video").empty();
+
+    new Clappr.Player({
+        <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
+        parentId: '#broadcast_video',
+        source: playback_url,
+        width: '100%',
+        height: '100%',
+        autoPlay: true
+    });
+
+    $(".dropdown-menu").children().removeClass('active');
+    $(".dropdown-menu").children().children('i').remove();
+    $(this).siblings().removeClass('active');
+    $(this).siblings().children("i").remove();
+    $(this).addClass('active');
+    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
+});

app/controllers/stream_notifications_controller.rb

@@ -60,16 +60,10 @@ class StreamNotificationsController < ApplicationController
   def set_broadcast
     if notification_type == "video.asset.static_renditions.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
-      @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
+      @broadcast = Broadcast.find_by!(stream_uid: live_stream_id)
     else
-      @broadcast = Broadcast.find_by(stream_uid: notification_object_id)
+      @broadcast = Broadcast.find_by!(stream_uid: notification_object_id)
     end
-
-    if @broadcast.nil?
-      logger.info "Ignoring broadcast from other environment. Type = #{notification_type}. Id = #{live_stream_id} / #{notification_object_id}"
-      head :ok
-    end
-    head :ok if @broadcast.nil?
   end
 
   def notify_users

app/policies/acquired_media_release_policy.rb

@@ -12,7 +12,7 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def tag_multiple?

app/policies/appearance_release_policy.rb

@@ -16,7 +16,7 @@ class AppearanceReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def tag_multiple?

app/policies/location_release_policy.rb

@@ -16,7 +16,7 @@ class LocationReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def edit_photos?

app/policies/material_release_policy.rb

@@ -16,7 +16,7 @@ class MaterialReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def edit_photos?

app/policies/medical_release_policy.rb

@@ -12,7 +12,7 @@ class MedicalReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def edit_photos?

app/policies/misc_release_policy.rb

@@ -12,7 +12,7 @@ class MiscReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def edit_photos?

app/policies/music_release_policy.rb

@@ -12,7 +12,7 @@ class MusicReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def tag_multiple?

app/policies/talent_release_policy.rb

@@ -12,7 +12,7 @@ class TalentReleasePolicy < ReleasePolicy
   end
 
   def destroy?
-    user.manager? || user.account_manager?
+    true
   end
 
   def edit_photos?

app/views/broadcasts/show.html.erb

@@ -33,7 +33,7 @@
             <%= link_to "Switch View", "#", class: "btn btn-light border dropdown-toggle", role: "button", id: "dropdownMenuLink", data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } %>
             <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
               <h5 class="dropdown-header">Live Streams</h5>
-              <span class="dropdown-item active"><%= fa_icon("check", text: @broadcast.name.titleize) %></span>
+              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", class: "dropdown-item active" %>
               <% @multi_view_broadcasts.each do |broadcast| %>
                 <% if broadcast.id != @broadcast.id %>
                   <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
@@ -159,4 +159,4 @@
       </div>
     </div>
   </div>
-<div>
+</div>

spec/controllers/stream_notifications_controller_spec.rb

@@ -7,7 +7,6 @@ RSpec.describe StreamNotificationsController, type: :controller do
   let(:active_status) { {type: "video.live_stream.active", object: { id: "mux_stream" }} }
   let(:disconnected_status) { {type: "video.live_stream.disconnected", object: { id: "mux_stream" }} }
   let(:idle_status) { {type: "video.live_stream.idle", object: { id: "mux_stream" }} }
-  let(:idle_status_for_unknown_broadcast) { {type: "video.live_stream.idle", object: { id: "unknown-id" }} }
   let(:asset_ready) { {
     type: "video.asset.static_renditions.ready",
     object: { id: "asset_uid" },
@@ -60,12 +59,6 @@ RSpec.describe StreamNotificationsController, type: :controller do
 
       expect(BroadcastsChannel).to have_received(:stream_recording_ready)
     end
-
-    it "returns OK response even for non-existing broadcast" do
-      post :create, params: idle_status_for_unknown_broadcast
-
-      expect(response).to be_successful
-    end
   end
 
   after do

spec/features/user_managing_broadcasts_spec.rb

@@ -54,6 +54,46 @@ feature "User managing broadcasts" do
       expect(page).to have_content(recording.download_file_name)
     end
 
+    scenario "user can go back and forth between live session and previous sessions", js: true do
+      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
+      recording = create(:broadcast_recording, broadcast: broadcast)
+
+      visit project_broadcast_path(project, broadcast)
+
+      expect(page).to have_content broadcast.name.titleize, count: 1
+      expect(page).to have_content recording.download_file_name, count: 0
+
+      click_on switch_view_dropdown
+      expect(page).to have_content broadcast.name.titleize, count: 2
+      expect(page).to have_content recording.download_file_name, count: 1
+
+      live_stream_nav_item = page.find(".dropdown-item", text: broadcast.name.titleize)
+      recording_nav_item = page.find(".dropdown-item", text: recording.download_file_name)
+
+      expect(live_stream_nav_item[:class].include?("active")).to eq true
+      expect(recording_nav_item[:class].include?("active")).to eq false
+
+      click_on recording.download_file_name
+
+      expect(page).to have_content broadcast.name.titleize, count: 1
+      expect(page).to have_content recording.download_file_name, count: 0
+      expect(live_stream_nav_item[:class].include?("active")).to eq false
+      expect(recording_nav_item[:class].include?("active")).to eq true
+
+      click_on switch_view_dropdown
+      click_on broadcast.name.titleize
+
+      expect(page).to have_content broadcast.name.titleize, count: 1
+      expect(page).to have_content recording.download_file_name, count: 0
+
+      # Page is reloaded, we need to get dropdown items again
+      live_stream_nav_item = page.find(".dropdown-item", text: broadcast.name.titleize, visible: :all)
+      recording_nav_item = page.find(".dropdown-item", text: recording.download_file_name, visible: :all)
+
+      expect(live_stream_nav_item[:class].include?("active")).to eq true
+      expect(recording_nav_item[:class].include?("active")).to eq false
+    end
+
     scenario "form will not submit if user clicks Add files without selected files", js: true do
       broadcast = create(:broadcast, :with_stream, :with_files, project: project)
 
@@ -74,9 +114,9 @@ feature "User managing broadcasts" do
       
       new_window = window_opened_by { click_link "Multi-View" }
       within_window new_window do
-        expect(page).to have_content("Switch View")
+        expect(page).to have_content switch_view_dropdown
 
-        click_on "Switch View"
+        click_on switch_view_dropdown
         expect(page).to have_link("Broadcast 1")
         expect(page).to have_link("Broadcast 2")
 
@@ -106,4 +146,8 @@ feature "User managing broadcasts" do
     all('input[type="checkbox"]')[0].click
     all('input[type="checkbox"]')[1].click
   end
+
+  def switch_view_dropdown
+    "Switch View"
+  end
 end

spec/policies/acquired_media_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe AcquiredMediaReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -25,14 +24,6 @@ describe AcquiredMediaReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
+    it { is_expected.to permit(:destroy) }
   end
 end

spec/policies/appearance_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe AppearanceReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -25,14 +24,6 @@ describe AppearanceReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
+    it { is_expected.to permit(:destroy) }
   end
 end

spec/policies/location_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe LocationReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -24,6 +23,10 @@ describe LocationReleasePolicy do
     end
   end
 
+  permissions :destroy? do
+    it { is_expected.to permit(:destroy) }
+  end
+
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -31,16 +34,4 @@ describe LocationReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
-
-  permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
-  end
 end

spec/policies/material_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe MaterialReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -24,6 +23,10 @@ describe MaterialReleasePolicy do
     end
   end
 
+  permissions :destroy? do
+    it { is_expected.to permit(:destroy) }
+  end
+
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -31,16 +34,4 @@ describe MaterialReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
-
-  permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
-  end
 end

spec/policies/medical_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe MedicalReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -24,6 +23,10 @@ describe MedicalReleasePolicy do
     end
   end
 
+  permissions :destroy? do
+    it { is_expected.to permit(:destroy) }
+  end
+
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -31,16 +34,4 @@ describe MedicalReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
-
-  permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
-  end
 end

spec/policies/misc_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe MiscReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -20,6 +19,10 @@ describe MiscReleasePolicy do
     end
   end
 
+  permissions :destroy? do
+    it { is_expected.to permit(:destroy) }
+  end
+
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -27,16 +30,4 @@ describe MiscReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
-
-  permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
-  end
 end

spec/policies/music_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 RSpec.describe MusicReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -19,14 +18,6 @@ RSpec.describe MusicReleasePolicy do
   end
 
   permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
+    it { is_expected.to permit(:destroy) }
   end
 end

spec/policies/talent_release_policy_spec.rb

@@ -1,8 +1,7 @@
 require "rails_helper"
 
 describe TalentReleasePolicy do
-  let(:user) { create(:user, :manager) }
-  let(:user_context) { build(:user_context, user: user, account: user.primary_account) }
+  let(:user_context) { build(:user_context) }
 
   subject { described_class }
 
@@ -24,6 +23,10 @@ describe TalentReleasePolicy do
     end
   end
 
+  permissions :destroy? do
+    it { is_expected.to permit(:destroy) }
+  end
+
   permissions :edit_photos? do
     it { is_expected.to permit(:edit_photos) }
   end
@@ -31,16 +34,4 @@ describe TalentReleasePolicy do
   permissions :update_photos? do
     it { is_expected.to permit(:update_photos) }
   end
-
-  permissions :destroy? do
-    it { is_expected.to permit(user_context, :destroy) }
-  end
-
-  context "for an associate" do
-    let(:user) { create(:user, :associate) }
-
-    permissions :destroy? do
-      it { is_expected.not_to permit(user_context, :destroy) }
-    end
-  end
 end