Skip to content

Update tests targets to Swift 4.2 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bcylin merged 5 commits into from
Oct 10, 2018
Merged

Update tests targets to Swift 4.2 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eb0d08
Bump Swift version to 4.2 for all targets
mttcrsp Oct 7, 2018
0e3bd88
Migrate the iOS tests target to Swift 4.2
mttcrsp Oct 7, 2018
92c0524
Migrate the tvOS tests target to Swift 4.2
mttcrsp Oct 7, 2018
f1d888b
Update workspace to Xcode 10 recommended settings
mttcrsp Oct 7, 2018
05bb4f7
Inhibit Quick warnings for test targets
mttcrsp Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ project "QuickTableViewController"
target "QuickTableViewController-iOSTests" do
platform :ios, "8.0"
pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.1.3"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1", :inhibit_warnings => true
end

target "QuickTableViewController-tvOSTests" do
platform :tvos, "9.0"
pod "Nimble", git: "https://github.com/Quick/Nimble.git", tag: "v7.1.3"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1"
pod "Quick", git: "https://github.com/Quick/Quick.git", tag: "v1.3.1", :inhibit_warnings => true
end

target "Example-iOS" do
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ SPEC CHECKSUMS:
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073

PODFILE CHECKSUM: 6dedfd3b564540ea44d6f3f3bf311afc936ee83a
PODFILE CHECKSUM: 209aaba56acbe1a7575f449d1faebf22752c3f27

COCOAPODS: 1.5.3
18 changes: 2 additions & 16 deletions QuickTableViewController.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1183,7 +1182,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1206,7 +1204,6 @@
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = "Example-iOS";
};
name = Debug;
Expand All @@ -1229,7 +1226,6 @@
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TEST_TARGET_NAME = "Example-iOS";
};
name = Release;
Expand Down Expand Up @@ -1292,7 +1288,7 @@
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -1348,7 +1344,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -1373,7 +1369,6 @@
PRODUCT_NAME = QuickTableViewController;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1394,7 +1389,6 @@
PRODUCT_NAME = QuickTableViewController;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1416,7 +1410,6 @@
PRODUCT_BUNDLE_IDENTIFIER = io.github.bcylin.QuickTableViewControllerTests;
PRODUCT_NAME = QuickTableViewControllerTests;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -1435,7 +1428,6 @@
PRODUCT_NAME = QuickTableViewControllerTests;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down Expand Up @@ -1464,7 +1456,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand Down Expand Up @@ -1494,7 +1485,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -1520,7 +1510,6 @@
PRODUCT_NAME = QuickTableViewControllerTests;
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.3;
};
Expand All @@ -1545,7 +1534,6 @@
PRODUCT_NAME = QuickTableViewControllerTests;
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 11.3;
};
Expand All @@ -1572,7 +1560,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -1598,7 +1585,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand Down
2 changes: 1 addition & 1 deletion QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ableViewController.xcodeproj/xcshareddata/xcschemes/QuickTableViewController-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...bleViewController.xcodeproj/xcshareddata/xcschemes/QuickTableViewController-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 4 additions & 4 deletions Tests/Row/OptionRowSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ internal final class OptionRowSpec: QuickSpec {

// RowStyle
expect(row.cellReuseIdentifier) == "UITableViewCell"
expect(row.cellStyle) == UITableViewCellStyle.default
expect(row.cellStyle) == UITableViewCell.CellStyle.default
expect(row.icon) == icon
expect(row.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(row.accessoryType) == UITableViewCell.AccessoryType.checkmark
expect(row.isSelectable) == true
expect(row.customize).to(beNil())
}
Expand Down Expand Up @@ -106,7 +106,7 @@ internal final class OptionRowSpec: QuickSpec {

it("should invoke the action closure") {
row.isSelected = true
expect(row.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(row.accessoryType) == UITableViewCell.AccessoryType.checkmark
expect(invoked).toEventually(beTrue())
}
}
Expand All @@ -117,7 +117,7 @@ internal final class OptionRowSpec: QuickSpec {

it("should not invoke the action closure") {
row.isSelected = false
expect(row.accessoryType) == UITableViewCellAccessoryType.none
expect(row.accessoryType) == UITableViewCell.AccessoryType.none
expect(invoked).toEventually(beFalse())
}
}
Expand Down
16 changes: 8 additions & 8 deletions Tests/View/ConfigurableSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == true
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
#endif
}

Expand All @@ -55,7 +55,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == false
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.none
expect(cell.accessoryType) == UITableViewCell.AccessoryType.none
#endif
}
}
Expand All @@ -70,7 +70,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == true
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
#endif
}

Expand All @@ -83,7 +83,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == false
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.none
expect(cell.accessoryType) == UITableViewCell.AccessoryType.none
#endif
}
}
Expand All @@ -98,7 +98,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == true
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
#endif
}

Expand All @@ -111,7 +111,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == false
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.none
expect(cell.accessoryType) == UITableViewCell.AccessoryType.none
#endif
}
}
Expand All @@ -126,7 +126,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == true
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
#endif
}

Expand All @@ -139,7 +139,7 @@ internal final class ConfigurableSpec: QuickSpec {
expect(cell.switchControl.isOn) == false
#elseif os(tvOS)
expect(cell.accessoryView).to(beNil())
expect(cell.accessoryType) == UITableViewCellAccessoryType.none
expect(cell.accessoryType) == UITableViewCell.AccessoryType.none
#endif
}
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/ViewController/QuickTableViewControllerSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ internal final class QuickTableViewControllerSpec: QuickSpec {

describe("init(style:)") {
it("should set up table view with style") {
expect(QuickTableViewController().tableView.style) == UITableViewStyle.grouped
expect(QuickTableViewController(style: .plain).tableView.style) == UITableViewStyle.plain
expect(QuickTableViewController().tableView.style) == UITableView.Style.grouped
expect(QuickTableViewController(style: .plain).tableView.style) == UITableView.Style.plain
}
}

Expand Down
6 changes: 3 additions & 3 deletions Tests/ViewController/QuickTableViewDataSourceSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ internal final class QuickTableViewDataSourceSpec: QuickSpec {
it("should have the disclosure indicator") {
for row in 0...3 {
let cell = controller.tableView(controller.tableView, cellForRowAt: IndexPath(row: row, section: 0))
expect(cell.accessoryType) == UITableViewCellAccessoryType.disclosureIndicator
expect(cell.accessoryType) == UITableViewCell.AccessoryType.disclosureIndicator
}
}
}
Expand Down Expand Up @@ -256,7 +256,7 @@ internal final class QuickTableViewDataSourceSpec: QuickSpec {
#if os(iOS)
expect((cell as? SwitchCell)?.switchControl.isOn) == true
#elseif os(tvOS)
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
#endif
}
}
Expand Down Expand Up @@ -316,7 +316,7 @@ internal final class QuickTableViewDataSourceSpec: QuickSpec {
}

it("should match the selection at \(index)") {
expect(cell.accessoryType) == UITableViewCellAccessoryType.checkmark
expect(cell.accessoryType) == UITableViewCell.AccessoryType.checkmark
}
}
}
Expand Down