Upstream sync

This commit is contained in:
Senad Uka
2020-08-20 06:50:51 +02:00
parent 190ff2854b
commit 41bf88e358
127 changed files with 1399 additions and 565 deletions

View File

@@ -301,7 +301,7 @@ feature "User managing acquired_media releases" do
end
by "attaching files" do
drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "file-info-dropzone"
drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "dropzone"
click_button create_release_button
expect(page).to have_invalid_field(acquired_media_name_field)
@@ -328,7 +328,7 @@ feature "User managing acquired_media releases" do
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"
drop_file Rails.root.join(file_fixture("person_photo.png")), type: "dropzone"
click_button update_release_button
expect(page).to have_content(update_release_notice)
@@ -366,20 +366,7 @@ feature "User managing acquired_media releases" do
email: "john.doe@test.com",
created_at: DateTime.new(2020, 2, 20, 11, 0, 0),
),
],
file_infos:
[
build(:file_info,
filename: "aaa.jpg",
content_type: "image/jpeg"),
build(:file_info,
filename: "bbb.mp4",
content_type: "video/mp4"),
build(:file_info,
filename: "unknown.doc",
content_type: "unknown/file")
]
)
sign_in(current_user)
@@ -398,12 +385,6 @@ feature "User managing acquired_media releases" do
expect(pdf_body).to have_content("Woman")
expect(pdf_body).to have_content("Brunette")
expect(pdf_body).to have_content("FILES")
expect(pdf_body).to have_content("Photos")
expect(pdf_body).to have_content("Videos")
expect(pdf_body).to have_content("aaa.jpg")
expect(pdf_body).to have_content("bbb.mp4")
expect(pdf_body).to have_content("unknown.doc")
expect(pdf_body).to have_content("Other files")
end
scenario "viewing the contract PDF for a minor" do