Skip to content

Commit ea878dd

Browse files
author
Luc Dion
committed
update
1 parent f5306f3 commit ea878dd

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Tests/Common/AdjustSizeSpec.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,19 +862,21 @@ class AdjustSizeSpec: QuickSpec {
862862
}
863863

864864
it("should produce the same size as the built-in sizeToFit() method") {
865-
_pinlayoutSetUnitTest(scale: 3)
865+
_pinlayoutSetUnitTest(scale: nil)
866866

867867
let label = PLabel(frame: CGRect.zero)
868868
label.text = "Lorem ipsum dolor sit amet"
869869
label.pin.sizeToFit()
870870
let size = label.bounds.size
871+
871872
label.bounds.size = CGSize.zero
872873
label.sizeToFit()
874+
873875
expect(size).to(equal(label.bounds.size))
874876
}
875877

876878
it("should produce the same size as the built-in sizeToFit() method when there is a transform applied") {
877-
_pinlayoutSetUnitTest(scale: 3)
879+
_pinlayoutSetUnitTest(scale: nil)
878880

879881
let label = PLabel(frame: CGRect.zero)
880882
label.text = "Lorem ipsum dolor sit amet"

build-ci.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
DERIVED_DATA=${1:-/tmp/PinLayout}
33

44
set -o pipefail &&
5-
65
rm -rf $DERIVED_DATA &&
76

87
echo "===============================" &&
98
echo "fastlane iOS travis" &&
109
echo "===============================" &&
1110
time bundle exec fastlane ios travis &&
1211

13-
1412
# echo "===============================" &&
1513
# echo "fastlane macOS travis" &&
1614
# echo "===============================" &&
@@ -21,9 +19,9 @@ echo "===============================" &&
2119
echo "iOS unit test" &&
2220
echo "===============================" &&
2321
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS -derivedDataPath $DERIVED_DATA -sdk iphonesimulator11.4 \
24-
-destination 'platform=iOS Simulator,name=iPhone 7 Plus,OS=11.4' \
25-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
26-
-destination 'platform=iOS Simulator,name=iPhone 6,OS=10.2'\
22+
-destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' \
23+
-destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' \
24+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
2725
| xcpretty &&
2826

2927

@@ -32,14 +30,14 @@ echo "tvOS unit test" &&
3230
echo "===============================" &&
3331
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS -derivedDataPath $DERIVED_DATA -sdk appletvsimulator11.4 \
3432
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=11.4' \
35-
| xcpretty
33+
| xcpretty &&
3634

3735

3836
echo "===============================" &&
3937
echo "macOS unit test" &&
4038
echo "===============================" &&
4139
time xcodebuild clean test -workspace PinLayout.xcworkspace -scheme PinLayout-macOS -derivedDataPath $DERIVED_DATA -sdk macosx10.13 \
42-
| xcpretty
40+
| xcpretty &&
4341

4442

4543
echo "===============================" &&
@@ -49,9 +47,9 @@ cd TestProjects/cocoapods/ios &&
4947
rm -rf $DERIVED_DATA &&
5048
pod install &&
5149
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
52-
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
50+
-destination 'platform=iOS Simulator,name=iPhone 8,OS=11.4' \
5351
| xcpretty &&
54-
cd ../../..
52+
cd ../../.. &&
5553

5654

5755
echo "===============================" &&
@@ -62,7 +60,7 @@ rm -rf $DERIVED_DATA &&
6260
pod install &&
6361
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS -sdk macosx10.13 -derivedDataPath $DERIVED_DATA \
6462
| xcpretty &&
65-
cd ../../..
63+
cd ../../.. &&
6664

6765

6866
echo "===============================" &&
@@ -74,7 +72,7 @@ pod install &&
7472
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS -sdk appletvsimulator11.4 -derivedDataPath $DERIVED_DATA \
7573
-destination 'platform=tvOS Simulator,name=Apple TV,OS=11.4' \
7674
| xcpretty &&
77-
cd ../../..
75+
cd ../../.. &&
7876

7977

8078
echo "===============================" &&
@@ -88,7 +86,7 @@ carthage update --use-ssh --platform iOS &&
8886
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator11.4 -derivedDataPath $DERIVED_DATA \
8987
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
9088
| xcpretty &&
91-
cd ../../..
89+
cd ../../.. &&
9290

9391

9492
# echo "==========================================" &&

fastlane/Fastfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ platform :ios do
6363
workspace: "PinLayout.xcworkspace",
6464
devices: [
6565
"iPhone 7 (10.2)",
66-
"iPhone 7 (11.2)",
67-
"iPad Air (11.2)",
68-
"iPhone X (11.2)"
66+
"iPhone 8 (11.4)",
67+
"iPad Air (11.4)",
68+
"iPhone X (11.4)"
6969
]
7070
)
7171
end

0 commit comments

Comments
 (0)