Fixed string.trim()

Esqarrouth · Jun 4, 2016 · 609fce3 · 609fce3
1 parent 5805497
commit 609fce3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
-	language: objective-c
+language: swift
 
 branches:
  only:
  - master
 
 xcode_project: EZSwiftExtensions.xcodeproj
-xcode_scheme: EZSwiftExtensionsTests
+xcode_scheme: EZSwiftExtensions
 osx_image: xcode7.3
 xcode_sdk: iphonesimulator9.1
 

diff --git a/EZSwiftExtensionsTests/EZSwiftExtensionsTestsString.swift b/EZSwiftExtensionsTests/EZSwiftExtensionsTestsString.swift
@@ -36,9 +36,13 @@ class EZSwiftExtensionsTestsString: XCTestCase {
     }
 
     func testTrim() {
-        string = "space space"
+        string = "  Hello how are you   "
         string.trim()
-        XCTAssertFalse(string.containsString(" "))
+        XCTAssertEqual(string, "Hello how are you")
+
+        string = "  \t\t  Lets trim all the whitespace  \n \t  \n  "
+        string.trim()
+        XCTAssertEqual(string, "Lets trim all the whitespace")
     }
 
     func testIsEmail() {

diff --git a/Sources/StringExtensions.swift b/Sources/StringExtensions.swift
@@ -53,7 +53,7 @@ extension String {
 
     /// EZSE: Trims white space and new line characters, returns a new string
     public func trimmed() -> String {
-        return self.componentsSeparatedByCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()).joinWithSeparator("")
+        return self.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
     }
 
     /// EZSE: Checks if String contains Email