diff --git a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m index 366596520a2159..774aa2c6859816 100644 --- a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m +++ b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m @@ -10,6 +10,8 @@ #import #import +#import "OCMock/OCMock.h" + static NSString *const testFile = @"test.jsbundle"; static NSString *const mainBundle = @"main.jsbundle"; @@ -94,6 +96,8 @@ - (void)testLocalhostURL - (void)testIPURL { + id classMock = OCMClassMock([RCTBundleURLProvider class]); + [[[classMock stub] andReturnValue:@YES] isPackagerRunning:[OCMArg any]]; RCTBundleURLProvider *settings = [RCTBundleURLProvider sharedSettings]; settings.jsLocation = @"192.168.1.1"; NSURL *URL = [settings jsBundleURLForBundleRoot:testFile fallbackResource:nil]; diff --git a/React/Base/RCTBundleURLProvider.mm b/React/Base/RCTBundleURLProvider.mm index b474d80beb677c..0a487289eb0f54 100644 --- a/React/Base/RCTBundleURLProvider.mm +++ b/React/Base/RCTBundleURLProvider.mm @@ -125,6 +125,11 @@ + (BOOL)isPackagerRunning:(NSString *)host - (NSString *)packagerServerHost { NSString *location = [self jsLocation]; +#if RCT_DEV_MENU + if (![RCTBundleURLProvider isPackagerRunning:location]) { + location = nil; + } +#endif if (location != nil) { return location; }