Merge pull request #325 from Instabug/fix/ios-tests-pods

iOS Native Tests with pods

Author: AliAbdelfattah

.circleci/config.yml

@@ -117,6 +117,32 @@ jobs:
           name: Run UnitTest
           command: cd android && ./gradlew test   
 
+
+  ios_test:
+    macos:
+      xcode: "10.2.0"
+    working_directory: ~/project/InstabugSample/ios
+    environment:
+      FL_OUTPUT_DIR: output
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Install node_modules
+          command: cd .. && yarn
+      - run:
+          name: Remove instabug.framework
+          command: rm -rf ../node_modules/instabug-reactnative/ios/Instabug.framework
+      - run:
+          name: Fetch CocoaPods Specs
+          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh  | bash -s cf
+      - run:
+          name: Install CocoaPods
+          command: pod install
+      - run:
+          name: Build and run tests
+          command: xcodebuild    -workspace InstabugSample.xcworkspace    -scheme InstabugSample    -sdk iphonesimulator    -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2'    test | xcpretty
+
   publish:
     macos:
       xcode: "10.1.0"
@@ -136,11 +162,13 @@ workflows:
       - test_module
       - test_sample
       - test_android
+      - ios_test
       - hold:
           requires:
             - test_module
             - test_sample
             - test_android
+            - ios_test
           type: approval
           filters:
             branches:

InstabugSample/.gitignore

@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+InstabugSample.xcworkspace
 
 # Android/IntelliJ
 #

InstabugSample/ios/InstabugSample-tvOS/Info.plist

@@ -5,64 +5,30 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-
-#import <React/RCTLog.h>
-#import <React/RCTRootView.h>
-
-#define TIMEOUT_SECONDS 600
-#define TEXT_TO_LOOK_FOR @"Welcome to React Native!"
+#import "OCMock/OCMock.h"
+#import "Instabug/Instabug.h"
+#import "Instabug/IBGSurvey.h"
+#import "InstabugReactBridge.h"
 
 @interface InstabugSampleTests : XCTestCase
-
+@property InstabugReactBridge *instabugBridge;
 @end
 
 @implementation InstabugSampleTests
 
-- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
-{
-  if (test(view)) {
-    return YES;
-  }
-  for (UIView *subview in [view subviews]) {
-    if ([self findSubviewInView:subview matching:test]) {
-      return YES;
-    }
-  }
-  return NO;
+- (void)setUp {
+  // Put setup code here. This method is called before the invocation of each test method in the class.
+  self.instabugBridge = [[InstabugReactBridge alloc] init];
 }
 
-- (void)testRendersWelcomeScreen
-{
-  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
-  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
-  BOOL foundElement = NO;
-
-  __block NSString *redboxError = nil;
-  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-    if (level >= RCTLogLevelError) {
-      redboxError = message;
-    }
-  });
-
-  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
-    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-
-    foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) {
-      if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
-        return YES;
-      }
-      return NO;
-    }];
-  }
-
-  RCTSetLogFunction(RCTDefaultLogFunction);
-
-  XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
-  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
+- (void)testShowingSurveyWithToken {
+  NSString *token = @"token";
+  id mock = OCMClassMock([IBGSurveys class]);
+  
+  [[[mock stub] classMethod] showSurveyWithToken:token];
+  [self.instabugBridge showSurveyWithToken:token];
+  [[[mock verify] classMethod] showSurveyWithToken:token];
 }
 
-
 @end

InstabugSample/ios/InstabugSample-tvOSTests/Info.plist

@@ -23,6 +23,8 @@ target 'InstabugSample' do
   pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
   pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
   pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  
+  pod 'OCMock', '~> 3.4'
 
   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
@@ -35,13 +37,3 @@ target 'InstabugSample' do
 
   use_native_modules!
 end
-
-target 'InstabugSample-tvOS' do
-  # Pods for InstabugSample-tvOS
-
-  target 'InstabugSample-tvOSTests' do
-    inherit! :search_paths
-    # Pods for testing
-  end
-
-end

InstabugSample/ios/InstabugSample.xcodeproj/project.pbxproj

@@ -12,4 +12,6 @@
 
 @interface InstabugReactBridge : RCTEventEmitter <RCTBridgeModule>
 
+- (void)showSurveyWithToken:(NSString *)surveyToken;
+
 @end