Fix failing tests

SD10 · SD10 · commit b24d8bcff21e · 2017-12-10T14:22:48.000-06:00
diff --git a/Sources/Controllers/MessagesViewController.swift b/Sources/Controllers/MessagesViewController.swift
@@ -1,3 +1,4 @@
+
 /*
  MIT License
 
diff --git a/Sources/Views/Cells/MessageCollectionViewCell.swift b/Sources/Views/Cells/MessageCollectionViewCell.swift
@@ -32,7 +32,12 @@ open class MessageCollectionViewCell: UICollectionViewCell, CollectionViewReusab
 
     open var avatarView = AvatarView()
 
-    open var messageContainerView = MessageContainerView()
+    open var messageContainerView: MessageContainerView = {
+        let containerView = MessageContainerView()
+        containerView.clipsToBounds = true
+        containerView.layer.masksToBounds = true
+        return containerView
+    }()
 
     open var cellTopLabel: UILabel = {
         let label = UILabel()
@@ -50,6 +55,7 @@ open class MessageCollectionViewCell: UICollectionViewCell, CollectionViewReusab
 
     override public init(frame: CGRect) {
         super.init(frame: frame)
+        contentView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         setupSubviews()
         setupGestureRecognizers()
     }
diff --git a/Tests/ControllersTest/MessagesViewControllerTests.swift b/Tests/ControllersTest/MessagesViewControllerTests.swift
@@ -40,6 +40,7 @@ class MessagesViewControllerTests: XCTestCase {
 
         sut = MessagesViewController()
         sut.messagesCollectionView.messagesLayoutDelegate = layoutDelegate
+        sut.messagesCollectionView.messagesDisplayDelegate = layoutDelegate
         _ = sut.view
         sut.beginAppearanceTransition(true, animated: true)
         sut.endAppearanceTransition()
@@ -193,7 +194,7 @@ class MessagesViewControllerTests: XCTestCase {
 
 }
 
-private class MockLayoutDelegate: MessagesLayoutDelegate {
+private class MockLayoutDelegate: MessagesLayoutDelegate, MessagesDisplayDelegate {
 
     // MARK: - LocationMessageLayoutDelegate
 
diff --git a/Tests/ProtocolsTests/MessagesDisplayDelegateTests.swift b/Tests/ProtocolsTests/MessagesDisplayDelegateTests.swift
@@ -243,15 +243,16 @@ private class MockMessagesViewController: MessagesViewController, MessagesDispla
         return 200
     }
 
-
     var dataProvider: MockMessagesDataSource!
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         dataProvider = makeDataSource()
+        messagesCollectionView.messagesDisplayDelegate = self
         messagesCollectionView.messagesDataSource = dataProvider
         messagesCollectionView.messagesLayoutDelegate = self
+
     }
 
     private func makeDataSource() -> MockMessagesDataSource {
diff --git a/Tests/ViewsTests/MessageCollectionViewCellTests.swift b/Tests/ViewsTests/MessageCollectionViewCellTests.swift
@@ -27,7 +27,7 @@ import XCTest
 
 class MessageCollectionViewCellTests: XCTestCase {
 
-    var cell: MessageCollectionViewCell<UIView>!
+    var cell: MessageCollectionViewCell!
     let frame = CGRect(x: 0, y: 0, width: 100, height: 100)
 
     override func setUp() {
@@ -42,20 +42,18 @@ class MessageCollectionViewCellTests: XCTestCase {
 
     func testInit() {
         XCTAssertEqual(cell.contentView.autoresizingMask, [.flexibleWidth, .flexibleHeight])
-        XCTAssertEqual(cell.contentView.subviews, [cell.cellTopLabel, cell.messageContainerView, cell.avatarView, cell.cellBottomLabel])
-        XCTAssertEqual(cell.messageContainerView.subviews, [cell.messageContentView])
+        XCTAssert(cell.contentView.subviews.contains(cell.cellTopLabel))
+        XCTAssert(cell.contentView.subviews.contains(cell.cellBottomLabel))
+        XCTAssert(cell.contentView.subviews.contains(cell.avatarView))
+        XCTAssert(cell.contentView.subviews.contains(cell.messageContainerView))
+
     }
 
     func testMessageContainerViewPropertiesSetup() {
         XCTAssertTrue(cell.messageContainerView.clipsToBounds)
         XCTAssertTrue(cell.messageContainerView.layer.masksToBounds)
     }
 
-    func testMessageContentViewPropertiesSetup() {
-        XCTAssertTrue(cell.messageContentView.clipsToBounds)
-        XCTAssertTrue(cell.messageContentView.isUserInteractionEnabled)
-    }
-
     func testPrepareForReuse() {
         cell.prepareForReuse()
         XCTAssertNil(cell.cellTopLabel.text)
@@ -70,7 +68,6 @@ class MessageCollectionViewCellTests: XCTestCase {
 
         XCTAssertEqual(cell.avatarView.frame, layoutAttributes.frame)
         XCTAssertEqual(cell.messageContainerView.frame, layoutAttributes.messageContainerFrame)
-        XCTAssertEqual(cell.messageContentView.frame, cell.messageContainerView.frame)
         XCTAssertEqual(cell.cellTopLabel.frame, layoutAttributes.topLabelFrame)
         XCTAssertEqual(cell.cellBottomLabel.frame, layoutAttributes.bottomLabelFrame)
     }

Original file line number	Diff line number	Diff line change
`@@ -243,15 +243,16 @@ private class MockMessagesViewController: MessagesViewController, MessagesDispla`
`243`	`243`	`return 200`
`244`	`244`	`}`
`245`	`245`
`246`		`-`
`247`	`246`	`var dataProvider: MockMessagesDataSource!`
`248`	`247`
`249`	`248`	`override func viewDidLoad() {`
`250`	`249`	`super.viewDidLoad()`
`251`	`250`
`252`	`251`	`dataProvider = makeDataSource()`
	`252`	`+ messagesCollectionView.messagesDisplayDelegate = self`
`253`	`253`	`messagesCollectionView.messagesDataSource = dataProvider`
`254`	`254`	`messagesCollectionView.messagesLayoutDelegate = self`
	`255`	`+`
`255`	`256`	`}`
`256`	`257`
`257`	`258`	`private func makeDataSource() -> MockMessagesDataSource {`