Update tests for row.cellStyle

Author: bcylin

.github/workflows/run_tests.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   run-tests:
-    name: Build and test
+    name: Run tests
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@master
@@ -28,14 +28,14 @@ jobs:
       - name: Pod install
         run: |
           bundle exec pod install
-      - name: Run unit tests
-        run: |
+      - run: |
           bundle exec fastlane ios unit_tests
+      - run: |
           bundle exec fastlane tvos unit_tests
       - name: Report coverage
         run: |
           bash <(curl -s https://codecov.io/bash) -cF ios -J "QuickTableViewController"
-      - name: Run UI tests
-        run: |
+      - run: |
           bundle exec fastlane ios ui_tests
+      - run: |
           bundle exec fastlane tvos ui_tests

Source/Rows/NavigationRow.swift

@@ -99,7 +99,7 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
     return T.reuseIdentifier + (detailText?.style.stringValue ?? "")
   }
 
-  /// Returns the table view cell style for the specified subtitle.
+  /// Returns the table view cell style for the specified detail text.
   public var cellStyle: UITableViewCell.CellStyle {
     return detailText?.style ?? .default
   }

Source/Rows/OptionRow.swift

@@ -82,8 +82,10 @@ open class OptionRow<T: UITableViewCell>: OptionRowCompatible, Equatable {
   /// The reuse identifier of the table view cell to display the row. The default value is **UITableViewCell**.
   public let cellReuseIdentifier: String = T.reuseIdentifier
 
-  /// The cell style is `.default`.
-  public let cellStyle: UITableViewCell.CellStyle = .default
+  /// Returns the table view cell style for the specified detail text.
+  public var cellStyle: UITableViewCell.CellStyle {
+    return detailText?.style ?? .default
+  }
 
   /// The icon of the row.
   public let icon: Icon?

Source/Rows/SwitchRow.swift

@@ -84,7 +84,7 @@ open class SwitchRow<T: SwitchCell>: SwitchRowCompatible, Equatable {
 
   /// Returns the table view cell style for the specified detail text.
   public var cellStyle: UITableViewCell.CellStyle {
-    return detailText?.style ?? .subtitle
+    return detailText?.style ?? .default
   }
 
   /// The icon of the row.

Tests/Row/OptionRowTests.swift

@@ -47,7 +47,7 @@ internal final class OptionRowTests: XCTestCase {
 
     // With RowStyle
     XCTAssertEqual(row.cellReuseIdentifier, "UITableViewCell")
-    XCTAssertEqual(row.cellStyle, .default)
+    XCTAssertEqual(row.cellStyle, .subtitle)
     XCTAssertEqual(row.icon, icon)
     XCTAssertEqual(row.accessoryType, .checkmark)
     XCTAssertEqual(row.isSelectable, true)

Tests/Row/SwitchRowTests.swift

@@ -46,8 +46,18 @@ internal final class SwitchRowTests: XCTestCase {
     XCTAssertEqual(row.switchValue, true)
 
     // With RowStyle
-    XCTAssertEqual(row.icon, icon)
     XCTAssertEqual(row.cellReuseIdentifier, "SwitchCell")
+    XCTAssertEqual(row.cellStyle, .subtitle)
+    XCTAssertEqual(row.icon, icon)
+    XCTAssertNil(row.customize)
+
+    #if os(iOS)
+      XCTAssertEqual(row.accessoryType, .none)
+      XCTAssertEqual(row.isSelectable, false)
+    #elseif os(tvOS)
+      XCTAssertEqual(row.accessoryType, .checkmark)
+      XCTAssertEqual(row.isSelectable, true)
+    #endif
 
     // When
     row.action?(row)