Upstream sync

app/assets/stylesheets/application.scss

@@ -6,6 +6,11 @@
 @import "dropzone/dist/dropzone";
 @import 'bootstrap-datepicker';
 
+// Global styles
+label {
+  text-transform: capitalize;
+}
+
 // Wordmarks
 .suite-wordmark {
   font-weight: normal;

app/models/acquired_media_release.rb

@@ -43,7 +43,8 @@ class AcquiredMediaRelease < ApplicationRecord
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
-  CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
+  CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
   def minor?
     false

config/locales/en.yml

@@ -346,8 +346,8 @@ en:
         person_first_name: Owner first name
         person_last_name: Owner last name
       material_release:
-        description: Description of licensed materials
+        description: Description of licensed material
-        name: Name of licensed materials
+        name: Name of licensed material
         person_address: Address
         person_address_city: City
         person_address_country: Country

lib/zoom_gateway.rb

@@ -29,7 +29,7 @@ class ZoomGateway
     end
 
     def enable_recordings?
-      ENV['ZOOM_ENABLE_RECORDINGS'] == '1'
+      ENV['ZOOM_ENABLE_RECORDINGS'] == 'true'
     end
 
     def apply_limits?

spec/features/user_managing_acquired_media_releases_spec.rb

@@ -19,7 +19,7 @@ feature "User managing acquired_media releases" do
 
       click_button "I have read and agree to the above"
 
-      expect(AcquiredMediaRelease.last.categories).to include("Artwork")
+      expect(AcquiredMediaRelease.last.categories).to include("Video Footage")
       expect(AcquiredMediaRelease.last.categories).to include("Still Photograph")
       expect(page).to have_content("Your release was successfully submitted. Thank you.")
     end
@@ -210,7 +210,7 @@ feature "User managing acquired_media releases" do
   end
 
   def acquired_media_category_fields
-    find(:css, "#acquired_media_release_categories_artwork").set(true)
+    find(:css, "#acquired_media_release_categories_video_footage").set(true)
     find(:css, "#acquired_media_release_categories_still_photograph").set(true)
   end
 

spec/features/user_performs_video_analysis_spec.rb

@@ -521,8 +521,8 @@ feature "User performs video analysis" do
       new_path = polymorphic_path([:new, video, release, :video_release_confirmation])
       first("form[action='#{new_path}']").click_button
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -572,8 +572,8 @@ feature "User performs video analysis" do
       new_path = polymorphic_path([:new, video, release, :video_release_confirmation])
       first("form[action='#{new_path}']").click_button
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -748,8 +748,8 @@ feature "User performs video analysis" do
 
       open_graphics_element_modal(video)
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -796,8 +796,8 @@ feature "User performs video analysis" do
 
       open_graphics_element_modal(video)
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1188,8 +1188,8 @@ feature "User performs video analysis" do
       open_audio_confirmation_modal
 
       expect(page).to have_field("Origin", with: "Original Music")
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
       expect(page).to have_field("Source EDL", with: "Audio")
 
       click_on "Show/Hide EDL Events"
@@ -1219,10 +1219,10 @@ feature "User performs video analysis" do
         expect(page).to have_field("Source EDL", with: "All Tracks")
         expect(page).to have_field("Channel", with: "A1")
         expect(page).to have_field("Origin", with: "Library Music")
-        expect(page).to have_field("Timecode in", with: "01:00:00:00")
+        expect(page).to have_field("Timecode In", with: "01:00:00:00")
         expect(page).to have_field("Timecode out", with: "01:00:02:00")
         expect(page).to have_field("Duration", with: "00:00:02")
-        expect(page).to have_field("Source file name", with: "source_file_name.wav")
+        expect(page).to have_field("Source File Name", with: "source_file_name.wav")
         expect(page).to have_field("Clip name", with: "clip_name")
         expect(page).to have_field("Description", with: "description")
 
@@ -1323,8 +1323,8 @@ feature "User performs video analysis" do
 
       open_unreleased_modal(video)
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1371,8 +1371,8 @@ feature "User performs video analysis" do
 
       open_unreleased_modal(video)
 
-      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source file name"
+      expect(page).to have_content "Source File Name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1445,7 +1445,7 @@ feature "User performs video analysis" do
 
     first("#suggested_matches form[action='#{new_path}']").click_button
 
-    expect(page).to have_content "Timecode in"
+    expect(page).to have_content "Timecode In"
 
     within "form[action='#{create_path}']" do
       click_button "Confirm Release"
@@ -1462,7 +1462,7 @@ feature "User performs video analysis" do
       $("#audio_matches .releasable-match button")[0].click()
     JS
 
-    expect(page).to have_content "Timecode in"
+    expect(page).to have_content "Timecode In"
   end
 
   def select_option(select_id, text)
@@ -1486,7 +1486,7 @@ feature "User performs video analysis" do
     JS
 
     expect(page).to have_field("Origin", with: "Library Music")
-    expect(page).to have_content "Timecode in"
+    expect(page).to have_content "Timecode In"
 
     within "form[action='#{create_path}']" do
       expect(page).to have_selector("#matched_file_name", text: "library_file_name")
@@ -1518,7 +1518,7 @@ feature "User performs video analysis" do
 
     first("form[action='#{new_path}']", text: text).click_button
 
-    expect(page).to have_content "Timecode in"
+    expect(page).to have_content "Timecode In"
 
     within "form[action='#{create_path}']" do
       click_button "Confirm Release"
@@ -1536,7 +1536,7 @@ feature "User performs video analysis" do
     first("#music_releases form[action='#{new_path}']", text: text).click_button
 
     expect(page).to have_field("Origin", with: "Original Music")
-    expect(page).to have_content "Timecode in"
+    expect(page).to have_content "Timecode In"
 
     within "form[action='#{create_path}']" do
       select "Vocal", from: "Music type"

spec/lib/zoom_gateway_spec.rb

@@ -66,16 +66,16 @@ RSpec.describe ZoomGateway do
     end
 
     context '.enable_recordings?' do
-      it 'is truthy when ZOOM_ENABLE_RECORDINGS is set to 1' do
+      it 'is truthy when ZOOM_ENABLE_RECORDINGS is set to true' do
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '1')
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', 'true')
         expect(ZoomGateway.enable_recordings?).to be_truthy
       end
 
       it 'is falsey otherwise' do
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '0')
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '1')
         expect(ZoomGateway.enable_recordings?).to be_falsey
 
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '2')
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', 'false')
         expect(ZoomGateway.enable_recordings?).to be_falsey
       end
     end