mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from vittoriom/osx/fixTestsAndEnableTravis 

Fixes tests not compiling on the OS X target and adds a line for the travis.yml so that tests are always ran
This commit is contained in:
Robert Payne 2016-04-30 20:50:12 +12:00
parent db027b3a6f 838b1238cd
commit 1770df617b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -10,6 +10,6 @@ before_install:
- gem install xcpretty -N - gem install xcpretty -N
script: script:
- set -o pipefail - set -o pipefail
- xcodebuild -project SnapKit.xcodeproj -scheme "SnapKit iOS" -sdk iphonesimulator - xcodebuild -project SnapKit.xcodeproj -scheme "SnapKit iOS" -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" ONLY_ACTIVE_ARCH=NO test | xcpretty -c
-destination "platform=iOS Simulator,name=iPhone 6" ONLY_ACTIVE_ARCH=NO test | xcpretty -c - xcodebuild -project SnapKit.xcodeproj -scheme "SnapKit OSX" ONLY_ACTIVE_ARCH=YES test | xcpretty -c
- pod lib lint --quick - pod lib lint --quick

8
Tests/Tests.swift
View File

@ -282,11 +282,11 @@ class SnapKitTests: XCTestCase {
XCTAssertEqual(constraints[0].secondAttribute, NSLayoutAttribute.Top, "Should be top") XCTAssertEqual(constraints[0].secondAttribute, NSLayoutAttribute.Top, "Should be top")
XCTAssertEqual(constraints[1].secondAttribute, NSLayoutAttribute.Bottom, "Should be bottom") XCTAssertEqual(constraints[1].secondAttribute, NSLayoutAttribute.Bottom, "Should be bottom")
XCTAssertEqual(constraints[0].firstItem as? UIView, view, "Should be added subview") XCTAssertEqual(constraints[0].firstItem as? View, view, "Should be added subview")
XCTAssertEqual(constraints[1].firstItem as? UIView, view, "Should be added subview") XCTAssertEqual(constraints[1].firstItem as? View, view, "Should be added subview")
XCTAssertEqual(constraints[0].secondItem as? UIView, container, "Should be containerView") XCTAssertEqual(constraints[0].secondItem as? View, container, "Should be containerView")
XCTAssertEqual(constraints[1].secondItem as? UIView, container, "Should be containerView") XCTAssertEqual(constraints[1].secondItem as? View, container, "Should be containerView")
XCTAssertEqual(constraints[0].constant, 10, "Should be 10") XCTAssertEqual(constraints[0].constant, 10, "Should be 10")
XCTAssertEqual(constraints[1].constant, -10, "Should be 10") XCTAssertEqual(constraints[1].constant, -10, "Should be 10")