Upstream sync

This commit is contained in:
Senad Uka
2020-09-16 05:39:08 +02:00
parent 5cf7be6f13
commit 28e0eb36b7
61 changed files with 419 additions and 268 deletions

View File

@@ -83,11 +83,7 @@ feature "User performs video analysis" do
create(:material_release, name: "Apple MacBook Air", project: project),
create(:material_release, name: "Microsoft Surface Pro", project: project)
]
acquired_media = create(:acquired_media_release, project: project)
acquired_file_info_1, acquired_file_info_2 = [
create(:file_info, filename: "Still Image", releasable: acquired_media),
create(:file_info, filename: "Artwork", releasable: acquired_media)
]
acquired_media = create(:acquired_media_release, :with_files, project: project)
music_release = create(:music_release, project: project)
music_file_info_1, music_file_info_2 = [
create(:file_info, filename: "I'm not afraid", releasable: music_release),
@@ -116,9 +112,10 @@ feature "User performs video analysis" do
end
within "#acquired_media_releases_section" do
search_for(:acquired_media_releases, text: "till")
expect(page).to have_content("Still Image")
expect(page).not_to have_content("Artwork")
search_for(:acquired_media_releases, text: "cont")
expect(page).to have_content("contract.pdf")
expect(page).not_to have_content("audio.mp3")
expect(page).not_to have_content("video_file.mp4")
end
within "#music_releases_section" do
@@ -350,34 +347,31 @@ feature "User performs video analysis" do
end
scenario "confirming an acquired media release", js: true do
acquired_media_release = create(:acquired_media_release_with_file_infos, project: project)
acquired_media_release.file_infos.first.update(filename: "shark jumping")
acquired_media_release.file_infos.second.update(filename: "pig flying")
acquired_media_release.file_infos.third.update(filename: "panda sneezing")
acquired_media_release = create(:acquired_media_release, :with_files, project: project)
sign_in current_user
visit video_video_analyses_path(video)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "shark jumping", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "contract.pdf", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
confirm_first_release_using_edl_modal(video, acquired_media_release, text: "shark jumping")
confirm_first_release_using_edl_modal(video, acquired_media_release, text: "contract.pdf")
expect(page).to have_confirmed_release(acquired_media_release, text: "shark jumping")
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
expect(page).to have_confirmed_release(acquired_media_release, text: "contract.pdf")
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
unconfirm_release(VideoReleaseConfirmation.last)
expect(page).not_to have_confirmed_release(acquired_media_release, text: "shark jumping")
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "shark jumping", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
expect(page).not_to have_confirmed_release(acquired_media_release, text: "contract.pdf")
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "contract.pdf", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
end
scenario "confirming a material release", js: true do
material_release = create(:material_release, project: project)
material_release = create(:material_release, :with_file, project: project)
sign_in current_user
visit video_video_analyses_path(video)
@@ -387,7 +381,6 @@ feature "User performs video analysis" do
confirm_first_release_using_edl_modal(video, material_release)
expect(page).to have_confirmed_release(material_release)
expect(page).not_to have_unconfirmed_release(material_release)
unconfirm_release(VideoReleaseConfirmation.last)