Merge branch 'master' into development

This commit is contained in:
Nathan Tannar
2018-11-04 14:57:20 -08:00
5 changed files with 6 additions and 15 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
build-and-test:
environment:
- DESTINATION: "platform=iOS Simulator,name=iPhone XR"
- DESTINATION: "platform=iOS Simulator,name=iPhone XS"
# Specify the Xcode version to use.
macos:
+1 -1
View File
@@ -4,7 +4,7 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
--------------------------------------
## Upcoming Release
## [2.0.0](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0)
### Changed
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'MessageKit'
s.version = '2.0.0-beta.1'
s.version = '2.0.0'
s.license = { :type => "MIT", :file => "LICENSE.md" }
s.summary = 'An elegant messages UI library for iOS.'
@@ -56,6 +56,9 @@ final class MessagesViewControllerSpec: QuickSpec {
it("has a MessagesCollectionView") {
expect(controller.messagesCollectionView).toNot(beNil())
}
it("sets the CollectionView's layout to be an instance of MessagesCollectionViewFlowLayout") {
expect(controller.messagesCollectionView.collectionViewLayout).to(beAnInstanceOf(MessagesCollectionViewFlowLayout.self))
}
}
context("after viewDidLoad") {
beforeEach {
@@ -55,18 +55,6 @@ class MessagesViewControllerTests: XCTestCase {
// MARK: - Test
func testMessageCollectionViewLayout_isMessageCollectionViewLayout() {
XCTAssertNotNil(sut.messagesCollectionView.collectionViewLayout)
XCTAssertTrue(sut.messagesCollectionView.collectionViewLayout is MessagesCollectionViewFlowLayout)
}
func testMessageCollectionView_hasMessageCollectionFlowLayoutAfterViewDidLoad() {
let layout = sut.messagesCollectionView.collectionViewLayout
XCTAssertNotNil(layout)
XCTAssertTrue(layout is MessagesCollectionViewFlowLayout)
}
func testViewDidLoad_shouldSetDelegateAndDataSourceToTheSameObject() {
XCTAssertEqual(sut.messagesCollectionView.delegate as? MessagesViewController,
sut.messagesCollectionView.dataSource as? MessagesViewController)