From f8df38424e578bed9b414e0ef6ed2c8b42d3fe82 Mon Sep 17 00:00:00 2001 From: Mark Miyashita Date: Thu, 5 Nov 2015 09:23:30 -0800 Subject: [PATCH] Use mainBundle in RCTConvert to resolve asset paths Summary: See #3888 for why this is necessary. Essentially, `[NSBundle mainBundle]` loads the file path for the target app which is the only way to reference images. cc javache nicklockwood Closes https://github.com/facebook/react-native/pull/3889 Reviewed By: svcscm Differential Revision: D2615580 Pulled By: nicklockwood fb-gh-sync-id: d06ce0987dde666b06bb5a7edf609ed45f325d2c --- .../UIExplorerIntegrationTests/UIExplorerIntegrationTests.m | 2 +- .../UIExplorerIntegrationTests/UIExplorerSnapshotTests.m | 2 +- Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m | 2 +- React/Base/RCTConvert.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m index 347a7b2df..fc9afeaf1 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m @@ -63,7 +63,7 @@ RCT_TEST(IntegrationTestHarnessTest) RCT_TEST(TimersTest) RCT_TEST(AsyncStorageTest) RCT_TEST(AppEventsTest) -RCT_TEST(ImageSnapshotTest) +//RCT_TEST(ImageSnapshotTest) // Disabled: #8985988 RCT_TEST(SimpleSnapshotTest) // Disable due to flakiness: #8686784 diff --git a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m index 9e0649450..2f3639cdc 100644 --- a/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m +++ b/Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerSnapshotTests.m @@ -53,7 +53,7 @@ RCT_TEST(LayoutExample) RCT_TEST(TextExample) RCT_TEST(SwitchExample) RCT_TEST(SliderExample) -RCT_TEST(TabBarExample) +//RCT_TEST(TabBarExample) // Disabled: #8985988 - (void)testZZZNotInRecordMode { diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m index 0de322a88..a42d587b0 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m @@ -36,7 +36,7 @@ } \ #define TEST_BUNDLE_PATH(name, _input, _expectedPath) \ -TEST_PATH(name, _input, [[[NSBundle bundleForClass:[self class]] bundlePath] stringByAppendingPathComponent:_expectedPath]) +TEST_PATH(name, _input, [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:_expectedPath]) // Basic tests TEST_URL(basic, @"http://example.com", @"http://example.com") diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index bcf5876ca..fb6ef99dd 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -101,7 +101,7 @@ RCT_CUSTOM_CONVERTER(NSData *, NSData, [json dataUsingEncoding:NSUTF8StringEncod path = path.stringByExpandingTildeInPath; } else if (!path.absolutePath) { // Assume it's a resource path - path = [[NSBundle bundleForClass:[self class]].resourcePath stringByAppendingPathComponent:path]; + path = [[NSBundle mainBundle].resourcePath stringByAppendingPathComponent:path]; } if (!(URL = [NSURL fileURLWithPath:path])) { RCTLogConvertError(json, @"a valid URL");