From 63e1abc1ca1de0b0f185fa76827cfbc10364a6fe Mon Sep 17 00:00:00 2001 From: Artyom Razinov Date: Wed, 18 Oct 2017 22:43:11 +0300 Subject: [PATCH] Fix missing fields in inout error of handle failure methods (#639) --- EarlGrey/Core/GREYElementInteraction.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EarlGrey/Core/GREYElementInteraction.m b/EarlGrey/Core/GREYElementInteraction.m index 3d889c6d7..19e7d7ceb 100644 --- a/EarlGrey/Core/GREYElementInteraction.m +++ b/EarlGrey/Core/GREYElementInteraction.m @@ -714,10 +714,10 @@ - (BOOL)grey_handleFailureOfAction:(id)action [GREYError grey_nestedDescriptionForError:actionError]); } else { if ([actionError isKindOfClass:[GREYError class]]) { - NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] init]; - errorDetails[kErrorDetailActionNameKey] = action.name; + GREYError *greyError = (GREYError *)actionError; + NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] initWithDictionary:greyError.errorInfo]; errorDetails[kErrorDetailElementMatcherKey] = _elementMatcher.description; - [(GREYError *)actionError setErrorInfo:errorDetails]; + [greyError setErrorInfo:errorDetails]; } *userProvidedError = actionError; } @@ -896,10 +896,10 @@ - (BOOL)grey_handleFailureOfAssertion:(id)assertion [GREYError grey_nestedDescriptionForError:assertionError]); } else { if ([assertionError isKindOfClass:[GREYError class]]) { - NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] init]; - errorDetails[kErrorDetailActionNameKey] = assertion.name; + GREYError *greyError = (GREYError *)assertionError; + NSMutableDictionary *errorDetails = [[NSMutableDictionary alloc] initWithDictionary:greyError.errorInfo]; errorDetails[kErrorDetailElementMatcherKey] = _elementMatcher.description; - [(GREYError *)assertionError setErrorInfo:errorDetails]; + [greyError setErrorInfo:errorDetails]; } *userProvidedError = assertionError; }