Merge branch 'master' into bugfix/4760-Swift-Briding

Author: gosha212

detox/ios/Detox/Actions/NSObject+DetoxActions.m

@@ -627,7 +627,12 @@ - (NSURL *)dtx_takeScreenshot:(nullable NSString*)name
 {
     UIImage *image = [self.dtx_view dtx_imageFromView];
     NSURL *path = [NSURL elementsScreenshotPath];
-    NSString *fileName = [NSString stringWithFormat:@"ImageScreenshot_%@.png", name != nil ? name : self];
+    NSString *fileName;
+    if (name != nil) {
+        fileName = [NSString stringWithFormat:@"ImageScreenshot_%@.png", name];
+    } else {
+        fileName = [NSString stringWithFormat:@"ImageScreenshot_%p.png", self];
+    }
     [image dtx_saveToPath:path fileName:fileName];
 
     return [path URLByAppendingPathComponent:fileName isDirectory:false];;

detox/src/configuration/loadExternalConfig.test.js

@@ -105,13 +105,13 @@ describe('loadExternalConfig', () => {
     await expect(loadExternalConfig({ cwd: DIR_BADCONFIG })).rejects.toThrow('something-that-does-not-exist');
   });
 
-  it('should fall back to fs-based config path resolution', () => {
+  it('should fall back to fs-based config path resolution', async () => {
     const absoluteConfigPath = path.join(DIR_PRIORITY, 'detox-config.json');
     const relativeConfigPath = path.relative(process.cwd(), absoluteConfigPath);
 
-    const absoluteConfig = loadExternalConfig({ configPath: absoluteConfigPath });
+    const absoluteConfig = await loadExternalConfig({ configPath: absoluteConfigPath });
     expect(logger.warn).not.toHaveBeenCalled();
-    const relativeConfig = loadExternalConfig({ configPath: relativeConfigPath });
+    const relativeConfig = await loadExternalConfig({ configPath: relativeConfigPath });
     expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('legacy filesystem'));
 
     expect(absoluteConfig).toEqual(relativeConfig);