Upstream sync

spec/features/user_managing_broadcasts_spec.rb

@@ -65,6 +65,25 @@ feature 'User managing broadcasts' do
       expect(page).to have_content(recording.name)
     end
 
+    context 'visit show page of active broadcast' do
+      scenario 'loads full live stream playback url if available' do
+        broadcast = create(:broadcast, :with_stream, :with_files, project: project, streamer_status: :recording, status: :active)
+
+        visit project_broadcast_path(project, broadcast)
+
+        expect(page.body).not_to match broadcast.stream_playback_url
+        expect(page.body).to match broadcast.full_live_stream_playback_url
+      end
+
+      scenario 'loads full broadcast asset url if available' do
+        broadcast = create(:broadcast, :with_stream, :with_files, project: project, streamer_status: :recording, status: :active, full_live_stream_playback_uid: '')
+
+        visit project_broadcast_path(project, broadcast)
+
+        expect(page.body).to match broadcast.stream_playback_url
+      end
+    end
+
     scenario 'Clicking Reset URL regenerates broadcast token' do
       broadcast = create(:broadcast, :with_stream, :with_files, project: project)
       old_token = broadcast.token

spec/features/user_managing_material_releases_spec.rb

@@ -37,7 +37,7 @@ feature "User managing material releases" do
       click_button submit_release_button
 
       expect(page).to have_content success_submit_message
-      expect(MaterialRelease.last.photos.attached?).to eq true
+      expect(MaterialRelease.last.files.attached?).to eq true
     end
 
     scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do
@@ -225,7 +225,7 @@ feature "User managing material releases" do
         click_button create_release_button
 
         expect(page).to have_content(create_release_notice)
-        expect(page).to have_photo("material_photo.png", visible: :all)
+        expect(page).to have_content("1")
 
         click_on "Manage"
         expect(page).to have_link("Download")
@@ -364,19 +364,19 @@ feature "User managing material releases" do
 
       visit project_material_releases_path(project)
 
-      expect(page).to have_content("Needs Photo")
+      expect(page).to have_content("No Media")
 
       click_on "Manage"
-      click_on "Photos"
+      click_on "Add Media"
 
-      expect(page).to have_content("Add Photos")
+      expect(page).to have_content("Add Files")
       expect(page).to have_content("Apple MacBook Air")
 
       drop_file Rails.root.join(file_fixture("material_photo.png")), type: :dropzone
       click_on "Save Changes"
 
-      expect(page).to have_content("The release has been updated")
-      expect(page).to have_photo("material_photo.png", visible: :all)
+      expect(page).to have_content("Files added successfully to the release")
+      expect(page).to have_content("1")
     end
 
     scenario "viewing the contract PDF" do