Merge pull request Skyscanner#271 from rethink-eder/customizations

Customize errorMessage position
artoymsd · Jan 7, 2020 · dd82b26 · dd82b26
2 parents 82c0bbb + 73ef34b
commit dd82b26
Show file tree

Hide file tree

Showing 6 changed files with 512 additions and 194 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: objective-c
 xcode_project: SkyFloatingLabelTextField/SkyFloatingLabelTextField.xcodeproj
 xcode_scheme: SkyFloatingLabelTextField
+before_install:
+    - gem install bundler
 script:
   - bundle exec rake ci
 matrix:

diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
             name: "SkyFloatingLabelTextFieldTests",
             dependencies: ["SkyFloatingLabelTextField"],
             path: "SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests"
-        ),
+        )
     ],
     swiftLanguageVersions: [.v4_2]
 )
diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Base.lproj/Main.storyboard b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Base.lproj/Main.storyboard
diff --git a/...LabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift b/...LabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift
@@ -98,4 +98,15 @@ class SettingTextsViewController: UIViewController {
             textField.isEnabled = !textField.isEnabled
         }
     }
+
+    @IBAction func errorPlacementChanged(_ segmentedControl: UISegmentedControl) {
+        switch segmentedControl.selectedSegmentIndex {
+        case 0:
+            textField?.errorMessagePlacement = .bottom
+        case 1:
+            textField?.errorMessagePlacement = .default
+        default:
+            break
+        }
+    }
 }
diff --git a/...loatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift b/...loatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift
@@ -192,6 +192,19 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         XCTAssertEqual(floatingLabelTextField.lineView.backgroundColor, self.customColor)
     }
 
+    func test_whenSettingErrorColor_withErrorMessagePlacementIsBottom_thenErrorLabelTextColorIsChangedToThisColor() {
+        // given
+        floatingLabelTextField.errorMessagePlacement = .bottom
+        floatingLabelTextField.errorMessage = "test"
+
+        // when
+        floatingLabelTextField.errorColor = self.customColor
+
+        // then
+        XCTAssertNotEqual(floatingLabelTextField.titleLabel.textColor, self.customColor)
+        XCTAssertEqual(floatingLabelTextField.errorLabel.textColor, self.customColor)
+    }
+
     func test_whenSettingSelectedTitleColor_withTextfieldBeingSelected_thenTitleLabelTextColorIsChangedToThisColor() {
         // given
         floatingLabelTextField.isSelected = true
@@ -915,6 +928,42 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ
         XCTAssertEqual(size.height, floatingLabelTextField.titleHeight() + floatingLabelTextField.textHeight())
     }
 
+    // MARK: Error Message Placement
+    func test_whenSettingErrorMessage_whenErrorMessagePlacementSetToDefault_thenTitleLabelTextIsChanged() {
+        // given
+        XCTAssertEqual(floatingLabelTextField.errorMessagePlacement, .default)
+
+        // when
+        floatingLabelTextField.errorMessage = "SAMPLE ERROR"
+
+        // then
+        XCTAssertEqual(floatingLabelTextField.titleLabel.text, "SAMPLE ERROR")
+    }
+
+    func test_whenSettingErrorMessage_whenErrorMessagePlacementSetToBottom_thenErrorLabelTextIsChanged() {
+        // given
+        floatingLabelTextField.title = "SAMPLE TITLE"
+        floatingLabelTextField.errorMessagePlacement = .bottom
+
+        // when
+        floatingLabelTextField.errorMessage = "SAMPLE ERROR"
+
+        // then
+        XCTAssertEqual(floatingLabelTextField.titleLabel.text, "SAMPLE TITLE")
+        XCTAssertEqual(floatingLabelTextField.errorLabel.text, "SAMPLE ERROR")
+    }
+
+    func test_whenErrorLabelAlignment_thenErrorLabelTextAlignemntIsChanged() {
+        // given
+        XCTAssertNotEqual(floatingLabelTextField.errorLabel.textAlignment, .center)
+
+        // when
+        floatingLabelTextField.errorLabelAlignment = .center
+
+        // then
+        XCTAssertEqual(floatingLabelTextField.errorLabel.textAlignment, .center)
+    }
+
     // MARK: - Helpers
 
     func failOnTimeoutAfterSeconds(_ timeout: TimeInterval) {