Upstream sync

spec/features/user_managing_acquired_media_releases_spec.rb

@@ -165,6 +165,24 @@ feature "User managing acquired_media releases" do
       sign_in current_user
     end
 
+    scenario "index table shows owner info" do
+      release = create(:acquired_media_release, :with_owner_info, :with_address, project: project)
+
+      visit project_acquired_media_releases_path(project)
+
+      expect(page).to have_content owner_info_table_header
+
+      expect(page).to have_content release.person_first_name
+      expect(page).to have_content release.person_last_name
+      expect(page).to have_content release.person_phone
+      expect(page).to have_content release.person_email
+      expect(page).to have_content release.person_address_street1
+      expect(page).to have_content release.person_address_city
+      expect(page).to have_content release.person_address_state
+      expect(page).to have_content release.person_address_zip
+      expect(page).to have_content release.person_address_country
+    end
+
     scenario "creating a release for an adult", js: true do
       visit new_project_acquired_media_release_path(project)
 
@@ -262,62 +280,63 @@ feature "User managing acquired_media releases" do
     end
 
     scenario "creating, updating, destroying a release", js: true do
-      release_data = {
-        name: "Test Acquired Media Release",
-        applicable_media: ApplicableMedium.last.label,
-        territory: Territory.last.label,
-        term: Term.last.label,
-        restriction: Restriction.first.label,
-        restriction_text: "Not available in China",
-      }
+      resize_window_to(1_000, 1_000) do
+        release_data = {
+          name: "Test Acquired Media Release",
+          applicable_media: ApplicableMedium.last.label,
+          territory: Territory.last.label,
+          term: Term.last.label,
+          restriction: Restriction.first.label,
+          restriction_text: "Not available in China",
+        }
 
-      sign_in current_user
-      visit new_project_acquired_media_release_path(project)
+        sign_in current_user
+        visit new_project_acquired_media_release_path(project)
 
-      by "attaching only a contract" do
-        attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false
-        click_button create_release_button
+        by "attaching only a contract" do
+          attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false
+          click_button create_release_button
 
-        expect(page).to have_invalid_field(acquired_media_name_field)
-      end
-
-      by "attaching files" do
-        drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "file-info-dropzone"
-        click_button create_release_button
-
-        expect(page).to have_invalid_field(acquired_media_name_field)
-      end
-
-      by "filling out the remaining information" do
-        fill_in_release_fields release_data
-        click_button create_release_button
-
-        expect(page).to have_content(create_release_notice)
-        expect(page).to have_content("1")
-
-        click_on "Manage"
-        expect(page).to have_link("Download")
-      end
-
-      it_also "updates an existing release" do
-        click_link "Edit"
-
-        within ".dropzone" do
-          expect(page).to have_filename("video_file.mp4")
+          expect(page).to have_invalid_field(acquired_media_name_field)
         end
 
-        expect(page).to have_filled_in_data(release_data)
+        by "attaching files" do
+          drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "file-info-dropzone"
+          click_button create_release_button
 
-        fill_in_release_fields name: "New name"
-        drop_file Rails.root.join(file_fixture("person_photo.png")), type: "file-info-dropzone"
-        click_button update_release_button
+          expect(page).to have_invalid_field(acquired_media_name_field)
+        end
 
-        expect(page).to have_content(update_release_notice)
-        expect(page).to have_content("New name")
-        expect(page).to have_content("2")
-      end
+        by "filling out the remaining information" do
+          fill_in_release_fields release_data
+          click_button create_release_button
 
-      it_also "deletes an existing release" do
+          expect(page).to have_content(create_release_notice)
+          expect(page).to have_content("1")
+
+          click_on "Manage"
+          expect(page).to have_link("Download")
+        end
+
+        it_also "updates an existing release" do
+          click_link "Edit"
+
+          within ".dropzone" do
+            expect(page).to have_filename("video_file.mp4")
+          end
+
+          expect(page).to have_filled_in_data(release_data)
+
+          fill_in_release_fields name: "New name"
+          drop_file Rails.root.join(file_fixture("person_photo.png")), type: "file-info-dropzone"
+          click_button update_release_button
+
+          expect(page).to have_content(update_release_notice)
+          expect(page).to have_content("New name")
+          expect(page).to have_content("2")
+        end
+
+        it_also "deletes an existing release" do
         click_button "Manage"
         accept_alert do
           click_link "Delete"
@@ -325,6 +344,7 @@ feature "User managing acquired_media releases" do
 
         expect(page).not_to have_content("New name")
       end
+      end
     end
 
     scenario "viewing the contract PDF for an adult" do
@@ -836,4 +856,8 @@ feature "User managing acquired_media releases" do
   def successful_import_message
     t 'acquired_media_releases.create.notice'
   end
+
+  def owner_info_table_header
+    t 'acquired_media_releases.index.table_headers.owner_info'
+  end
 end

spec/features/user_managing_location_releases_spec.rb

@@ -87,7 +87,7 @@ feature "User managing location releases" do
 
       visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release)
 
-      expect(page).to have_content amendments_heading
+      expect(page).to have_content amendments_heading.upcase
 
       fill_in amendment_signer_name_field, with: 'Big Signer'
       draw_signature file_fixture("signature.png"), amendment_signature_field
@@ -250,10 +250,7 @@ feature "User managing location releases" do
 
       new_window = window_opened_by { click_link sign_amendment_link }
       within_window new_window do
-        expect(page).to have_content amendments_heading
-        expect(page).to have_content signed_contract_preview.upcase
-
-        expect(page).to have_selector 'embed'
+        expect(page).to have_content amendments_heading.upcase
 
         fill_in amendment_signer_name_field, with: 'Big Signer'
         draw_signature file_fixture("signature.png"), amendment_signature_field

spec/features/user_managing_material_releases_spec.rb

@@ -185,6 +185,24 @@ feature "User managing material releases" do
       sign_in current_user
     end
 
+    scenario "index table shows owner info" do
+      release = create(:material_release, :native, :with_address, project: project)
+
+      visit project_material_releases_path(project)
+
+      expect(page).to have_content owner_info_table_header
+
+      expect(page).to have_content release.person_first_name
+      expect(page).to have_content release.person_last_name
+      expect(page).to have_content release.person_phone
+      expect(page).to have_content release.person_email
+      expect(page).to have_content release.person_address_street1
+      expect(page).to have_content release.person_address_city
+      expect(page).to have_content release.person_address_state
+      expect(page).to have_content release.person_address_zip
+      expect(page).to have_content release.person_address_country
+    end
+
     scenario "creating a release for and adult", js: true do
       visit new_project_material_release_path(project)
 
@@ -813,4 +831,8 @@ feature "User managing material releases" do
   def signature_field
     'material_release_signature_base64'
   end
+
+  def owner_info_table_header
+    t 'material_releases.index.table_headers.owner_info'
+  end
 end