mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
Media Browser: Listen to the timeline in the preview screen (#3707)
* Listen to the timeline to load more items in the media preview screen. * Fix the view model tests. * Fix tests
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
|
||||
import Combine
|
||||
import MatrixRustSDK
|
||||
import QuickLook
|
||||
import SwiftUI
|
||||
import XCTest
|
||||
|
||||
@@ -24,7 +25,7 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
// Given a fresh view model.
|
||||
setupViewModel()
|
||||
XCTAssertFalse(mediaProvider.loadFileFromSourceFilenameCalled)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[0])
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.dataSource.previewItems[0])
|
||||
XCTAssertNotNil(context.viewState.currentItemActions)
|
||||
|
||||
// When the preview controller sets the current item.
|
||||
@@ -32,27 +33,32 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
|
||||
// Then the view model should load the item and update its view state.
|
||||
XCTAssertTrue(mediaProvider.loadFileFromSourceFilenameCalled)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[0])
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.dataSource.previewItems[0])
|
||||
XCTAssertNotNil(context.viewState.currentItemActions)
|
||||
}
|
||||
|
||||
func testLoadingItemFailure() async throws {
|
||||
// Given a fresh view model.
|
||||
setupViewModel()
|
||||
guard let currentItem = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item")
|
||||
return
|
||||
}
|
||||
|
||||
XCTAssertFalse(mediaProvider.loadFileFromSourceFilenameCalled)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[0])
|
||||
XCTAssertNil(context.viewState.currentItem.downloadError)
|
||||
XCTAssertEqual(currentItem, context.viewState.dataSource.previewItems[0])
|
||||
XCTAssertNil(currentItem.downloadError)
|
||||
|
||||
// When the preview controller sets an item that fails to load.
|
||||
mediaProvider.loadFileFromSourceFilenameClosure = { _, _ in .failure(.failedRetrievingFile) }
|
||||
let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.previewItems[0]))
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.dataSource.previewItems[0]))
|
||||
try await failure.fulfill()
|
||||
|
||||
// Then the view model should load the item and update its view state.
|
||||
XCTAssertTrue(mediaProvider.loadFileFromSourceFilenameCalled)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[0])
|
||||
XCTAssertNotNil(context.viewState.currentItem.downloadError)
|
||||
XCTAssertEqual(currentItem, context.viewState.dataSource.previewItems[0])
|
||||
XCTAssertNotNil(currentItem.downloadError)
|
||||
}
|
||||
|
||||
func testSwipingBetweenItems() async throws {
|
||||
@@ -61,21 +67,57 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
|
||||
// When swiping to another item.
|
||||
let deferred = deferFulfillment(viewModel.state.fileLoadedPublisher) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.previewItems[1]))
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.dataSource.previewItems[1]))
|
||||
try await deferred.fulfill()
|
||||
|
||||
// Then the view model should load the item and update its view state.
|
||||
XCTAssertEqual(mediaProvider.loadFileFromSourceFilenameCallsCount, 2)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[1])
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.dataSource.previewItems[1])
|
||||
|
||||
// When swiping back to the first item.
|
||||
let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.previewItems[0]))
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.dataSource.previewItems[0]))
|
||||
try await failure.fulfill()
|
||||
|
||||
// Then the view model should not need to load the item, but should still update its view state.
|
||||
XCTAssertEqual(mediaProvider.loadFileFromSourceFilenameCallsCount, 2)
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.previewItems[0])
|
||||
XCTAssertEqual(context.viewState.currentItem, context.viewState.dataSource.previewItems[0])
|
||||
}
|
||||
|
||||
func testLoadingMoreItem() async throws {
|
||||
// Given a view model with a loaded item.
|
||||
try await testLoadingItem()
|
||||
|
||||
// When swiping to a "loading more" item.
|
||||
let deferred = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(nil))
|
||||
try await deferred.fulfill()
|
||||
|
||||
// Then there should no longer be a media preview and no attempt should be made to load one.
|
||||
XCTAssertEqual(mediaProvider.loadFileFromSourceFilenameCallsCount, 1)
|
||||
XCTAssertNil(context.viewState.currentItem)
|
||||
}
|
||||
|
||||
func testPagination() async throws {
|
||||
// Given a view model with a loaded item.
|
||||
try await testLoadingItem()
|
||||
XCTAssertEqual(context.viewState.dataSource.previewItems.count, 3)
|
||||
|
||||
// When more items are added via a back pagination.
|
||||
let deferred = deferFulfillment(context.viewState.dataSource.previewItemsPaginationPublisher) { _ in true }
|
||||
timelineController.backPaginationResponses.append(makeItems())
|
||||
_ = await timelineController.paginateBackwards(requestSize: 20)
|
||||
try await deferred.fulfill()
|
||||
|
||||
// And the preview controller attempts to update the current item (now at a new index in the array but it hasn't changed in the data source).
|
||||
mediaProvider.loadFileFromSourceFilenameClosure = { _, _ in .failure(.failedRetrievingFile) }
|
||||
let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.dataSource.previewItems[3]))
|
||||
try await failure.fulfill()
|
||||
|
||||
// Then the current item shouldn't need to be reloaded.
|
||||
XCTAssertEqual(context.viewState.dataSource.previewItems.count, 6)
|
||||
XCTAssertEqual(mediaProvider.loadFileFromSourceFilenameCallsCount, 1)
|
||||
}
|
||||
|
||||
func testViewInRoomTimeline() async throws {
|
||||
@@ -83,7 +125,11 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
try await testLoadingItem()
|
||||
|
||||
// When choosing to view the current item in the timeline.
|
||||
let item = context.viewState.currentItem
|
||||
guard let item = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item.")
|
||||
return
|
||||
}
|
||||
|
||||
let deferred = deferFulfillment(viewModel.actions) { $0 == .viewInRoomTimeline(item.id) }
|
||||
context.send(viewAction: .menuAction(.viewInRoomTimeline, item: item))
|
||||
|
||||
@@ -126,28 +172,35 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
func testSaveImage() async throws {
|
||||
// Given a view model with a loaded image.
|
||||
try await testLoadingItem()
|
||||
XCTAssertEqual(viewModel.state.currentItem.contentType, "JPEG image")
|
||||
guard let currentItem = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item")
|
||||
return
|
||||
}
|
||||
XCTAssertEqual(currentItem.contentType, "JPEG image")
|
||||
|
||||
// When choosing to save the image.
|
||||
let item = context.viewState.currentItem
|
||||
context.send(viewAction: .menuAction(.save, item: item))
|
||||
context.send(viewAction: .menuAction(.save, item: currentItem))
|
||||
try await Task.sleep(for: .seconds(0.5))
|
||||
|
||||
// Then the image should be saved as a photo to the user's photo library.
|
||||
XCTAssertTrue(photoLibraryManager.addResourceAtCalled)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.type, .photo)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.url, item.fileHandle?.url)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.url, currentItem.fileHandle?.url)
|
||||
}
|
||||
|
||||
func testSaveImageWithoutAuthorization() async throws {
|
||||
// Given a view model with a loaded image where the user has denied access to the photo library.
|
||||
setupViewModel(photoLibraryAuthorizationDenied: true)
|
||||
try await loadInitialItem()
|
||||
XCTAssertEqual(viewModel.state.currentItem.contentType, "JPEG image")
|
||||
guard let currentItem = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item")
|
||||
return
|
||||
}
|
||||
XCTAssertEqual(currentItem.contentType, "JPEG image")
|
||||
|
||||
// When choosing to save the image.
|
||||
let deferred = deferFulfillment(context.$viewState) { $0.bindings.alertInfo != nil }
|
||||
context.send(viewAction: .menuAction(.save, item: context.viewState.currentItem))
|
||||
context.send(viewAction: .menuAction(.save, item: currentItem))
|
||||
try await deferred.fulfill()
|
||||
|
||||
// Then the user should be prompted to allow access.
|
||||
@@ -159,34 +212,40 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
// Given a view model with a loaded video.
|
||||
setupViewModel(initialItemIndex: 1)
|
||||
try await loadInitialItem()
|
||||
XCTAssertEqual(viewModel.state.currentItem.contentType, "MPEG-4 movie")
|
||||
guard let currentItem = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item")
|
||||
return
|
||||
}
|
||||
XCTAssertEqual(currentItem.contentType, "MPEG-4 movie")
|
||||
|
||||
// When choosing to save the video.
|
||||
let item = context.viewState.currentItem
|
||||
context.send(viewAction: .menuAction(.save, item: item))
|
||||
context.send(viewAction: .menuAction(.save, item: currentItem))
|
||||
try await Task.sleep(for: .seconds(0.5))
|
||||
|
||||
// Then the video should be saved as a video in the user's photo library.
|
||||
XCTAssertTrue(photoLibraryManager.addResourceAtCalled)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.type, .video)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.url, item.fileHandle?.url)
|
||||
XCTAssertEqual(photoLibraryManager.addResourceAtReceivedArguments?.url, currentItem.fileHandle?.url)
|
||||
}
|
||||
|
||||
func testSaveFile() async throws {
|
||||
// Given a view model with a loaded file.
|
||||
setupViewModel(initialItemIndex: 2)
|
||||
try await loadInitialItem()
|
||||
XCTAssertEqual(viewModel.state.currentItem.contentType, "PDF document")
|
||||
guard let currentItem = context.viewState.currentItem else {
|
||||
XCTFail("There should be a current item")
|
||||
return
|
||||
}
|
||||
XCTAssertEqual(currentItem.contentType, "PDF document")
|
||||
|
||||
// When choosing to save the file.
|
||||
let item = context.viewState.currentItem
|
||||
context.send(viewAction: .menuAction(.save, item: item))
|
||||
context.send(viewAction: .menuAction(.save, item: currentItem))
|
||||
try await Task.sleep(for: .seconds(0.5))
|
||||
|
||||
// Then the binding should be set for the user to export the file to their specified location.
|
||||
XCTAssertFalse(photoLibraryManager.addResourceAtCalled)
|
||||
XCTAssertNotNil(context.fileToExport)
|
||||
XCTAssertEqual(context.fileToExport?.url, item.fileHandle?.url)
|
||||
XCTAssertEqual(context.fileToExport?.url, currentItem.fileHandle?.url)
|
||||
}
|
||||
|
||||
func testDismiss() async throws {
|
||||
@@ -205,20 +264,27 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
|
||||
private func loadInitialItem() async throws {
|
||||
let deferred = deferFulfillment(viewModel.state.fileLoadedPublisher) { _ in true }
|
||||
context.send(viewAction: .updateCurrentItem(context.viewState.previewItems[context.viewState.initialItemIndex]))
|
||||
let initialItem = context.viewState.dataSource.previewController(QLPreviewController(),
|
||||
previewItemAt: context.viewState.dataSource.initialItemIndex)
|
||||
guard let initialPreviewItem = initialItem as? TimelineMediaPreviewItem else {
|
||||
XCTFail("1234")
|
||||
return
|
||||
}
|
||||
context.send(viewAction: .updateCurrentItem(initialPreviewItem))
|
||||
try await deferred.fulfill()
|
||||
}
|
||||
|
||||
@Namespace private var testNamespace
|
||||
|
||||
private func setupViewModel(initialItemIndex: Int = 0, photoLibraryAuthorizationDenied: Bool = false) {
|
||||
let initialItems = makeItems()
|
||||
timelineController = MockRoomTimelineController(timelineKind: .media(.mediaFilesScreen))
|
||||
timelineController.timelineItems = items
|
||||
timelineController.timelineItems = initialItems
|
||||
|
||||
mediaProvider = MediaProviderMock(configuration: .init())
|
||||
photoLibraryManager = PhotoLibraryManagerMock(.init(authorizationDenied: photoLibraryAuthorizationDenied))
|
||||
|
||||
viewModel = TimelineMediaPreviewViewModel(context: .init(item: items[initialItemIndex],
|
||||
viewModel = TimelineMediaPreviewViewModel(context: .init(item: initialItems[initialItemIndex],
|
||||
viewModel: TimelineViewModel.mock(timelineKind: .media(.mediaFilesScreen),
|
||||
timelineController: timelineController),
|
||||
namespace: testNamespace),
|
||||
@@ -228,41 +294,43 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
|
||||
appMediator: AppMediatorMock())
|
||||
}
|
||||
|
||||
private let items: [EventBasedMessageTimelineItemProtocol] = [
|
||||
ImageRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: "", displayName: "Sally Sanderson"),
|
||||
content: .init(filename: "Amazing image.jpeg",
|
||||
caption: "A caption goes right here.",
|
||||
imageInfo: .mockImage,
|
||||
thumbnailInfo: .mockThumbnail,
|
||||
contentType: .jpeg)),
|
||||
VideoRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: ""),
|
||||
content: .init(filename: "Super video.mp4",
|
||||
videoInfo: .mockVideo,
|
||||
thumbnailInfo: .mockThumbnail,
|
||||
contentType: .mpeg4Movie)),
|
||||
FileRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: ""),
|
||||
content: .init(filename: "Important file.pdf",
|
||||
source: try? .init(url: .mockMXCFile, mimeType: "document/pdf"),
|
||||
fileSize: 2453,
|
||||
thumbnailSource: nil,
|
||||
contentType: .pdf))
|
||||
]
|
||||
private func makeItems() -> [EventBasedMessageTimelineItemProtocol] {
|
||||
[
|
||||
ImageRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: "", displayName: "Sally Sanderson"),
|
||||
content: .init(filename: "Amazing image.jpeg",
|
||||
caption: "A caption goes right here.",
|
||||
imageInfo: .mockImage,
|
||||
thumbnailInfo: .mockThumbnail,
|
||||
contentType: .jpeg)),
|
||||
VideoRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: ""),
|
||||
content: .init(filename: "Super video.mp4",
|
||||
videoInfo: .mockVideo,
|
||||
thumbnailInfo: .mockThumbnail,
|
||||
contentType: .mpeg4Movie)),
|
||||
FileRoomTimelineItem(id: .randomEvent,
|
||||
timestamp: .mock,
|
||||
isOutgoing: false,
|
||||
isEditable: false,
|
||||
canBeRepliedTo: true,
|
||||
isThreaded: false,
|
||||
sender: .init(id: ""),
|
||||
content: .init(filename: "Important file.pdf",
|
||||
source: try? .init(url: .mockMXCFile, mimeType: "document/pdf"),
|
||||
fileSize: 2453,
|
||||
thumbnailSource: nil,
|
||||
contentType: .pdf))
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user