Skip to content

Commit

Permalink
Make constraint pass
Browse files Browse the repository at this point in the history
  • Loading branch information
orta authored and raphaelcruzeiro committed Sep 16, 2016
1 parent a44cd24 commit 01906c8
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 42 deletions.
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ DerivedData
*.xcuserstate

Pods/
.DS_Store
60 changes: 36 additions & 24 deletions Cartography.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions CartographyTests/PrioritySpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ class PrioritySpec: QuickSpec {
}

it("should operate on a single constraint") {
var constraint: NSLayoutConstraint
var constraint: NSLayoutConstraint!

constrain(view) { (view: LayoutProxy) -> Void in
constraint = (view.width == 200 ~ 100)
constrain(view) { (view: LayoutProxy) in
constraint = view.width == 200
constraint ~ 100
}

expect(constraint.priority).to(equal(100))
Expand Down
17 changes: 4 additions & 13 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
platform :ios, '8.0'

def testing_pods
abstract_target "TestPods" do
use_frameworks!
pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git'
pod 'Quick', :git => 'https://github.com/Quick/Quick.git', :branch => 'swift-3.0'
end

target 'Cartography-iOS-Tests' do
testing_pods
end

target 'Cartography-Mac-Tests' do
testing_pods
target 'Cartography-iOS-Tests'
target 'Cartography-Mac-Tests'
target 'Cartography-tvOS-tests'
end

target 'Cartography-tvOS-tests' do
testing_pods
end

4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ SPEC CHECKSUMS:
Nimble: c5b995b4cd57789ec44b0cfb79640fc00e61a8c7
Quick: 31fb576b6cbb6b028cc5e0016e4366accbb346f5

PODFILE CHECKSUM: 94e62a1cbb74d497712b7925a67bd347a615d4e5
PODFILE CHECKSUM: ce4c62801384f67ace14dd8d318950c7e7623180

COCOAPODS: 1.1.0.beta.1
COCOAPODS: 1.1.0.rc.2

0 comments on commit 01906c8

Please sign in to comment.