Avoid force unwraps that could crash on tests - Fixes optonaut#87

demonar · Jun 16, 2016 · fa897a0 · fa897a0
1 parent 707f4cb
commit fa897a0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ActiveLabelTests/ActiveTypeTests.swift b/ActiveLabelTests/ActiveTypeTests.swift
@@ -29,8 +29,8 @@ class ActiveTypeTests: XCTestCase {
         return label.activeElements.flatMap({$0.1.flatMap({$0.element})})
     }
 
-    var currentElementString: String {
-        let currentElement = activeElements.first!
+    var currentElementString: String? {
+        guard let currentElement = activeElements.first else { return nil }
         switch currentElement {
         case .Mention(let mention):
             return mention
@@ -43,8 +43,8 @@ class ActiveTypeTests: XCTestCase {
         }
     }
 
-    var currentElementType: ActiveType {
-        let currentElement = activeElements.first!
+    var currentElementType: ActiveType? {
+        guard let currentElement = activeElements.first else { return nil }
         switch currentElement {
         case .Mention:
             return .Mention