Merge branch 'feature/test' into develop

keshavvishwkarma · Aug 15, 2016 · fadd664 · fadd664
2 parents 83a0844 + 599d2a3
commit fadd664
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
@@ -5337,7 +5337,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_SWIFT_FLAGS = "-D DEBUG -D STAGING";
+				OTHER_SWIFT_FLAGS = "-D DEBUG -D STAGING_";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};

diff --git a/YepKitTests/ServiceTests.swift b/YepKitTests/ServiceTests.swift
@@ -122,7 +122,7 @@ final class ServiceTests: XCTestCase {
                 }
             }
         })
-        expectation.fulfill() // tmp workaround
+        //expectation.fulfill() // tmp workaround
 
         waitForExpectationsWithTimeout(30, handler: nil)
     }

diff --git a/YepUITests/YepUITests.swift b/YepUITests/YepUITests.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2016年 Catch Inc. All rights reserved.
 //
 
+#if UI_TESTS
 import XCTest
 
 final class YepUITests: XCTestCase {
@@ -149,8 +150,6 @@ final class YepUITests: XCTestCase {
         guard textField2.exists else {
             return
         }
-        textField2.typeText("app")
-        app.buttons["Done"].tap()
 
         app.buttons["Cancel"].tap()
     }
@@ -184,16 +183,6 @@ final class YepUITests: XCTestCase {
         textField.tap()
         textField.typeText("test")
         app.buttons["Done"].tap()
-
-        let test = app.tables.staticTexts["test"]
-        guard test.exists else {
-            return
-        }
-        test.tap()
-
-        app.navigationBars["test"].buttons["icon back"].tap()
-
-        app.buttons["Cancel"].tap()
     }
 
     func testSearchInFeeds() {
@@ -229,4 +218,5 @@ final class YepUITests: XCTestCase {
         app.buttons["Cancel"].tap()
     }
 }
+#endif