kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-04-24 03:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
This commit is contained in:
Adlai Holler
2015-12-13 10:05:03 -08:00
parent b16a9e294e 0cc229d38d
commit 7079a9cc79
51 changed files with 886 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKitTests/ASDisplayNodeTests.m
View File

@@ -1722,7 +1722,7 @@ static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point
ASTestWindow *window = [ASTestWindow new];
[window addSubview:cellNode.view];
XCTAssert(node.hasFetchedData);
XCTAssert(node.interfaceState == ASInterfaceStateFetchData);
XCTAssert(node.interfaceState == ASInterfaceStateInHierarchy);
}
- (void)testInitWithViewClass

2
AsyncDisplayKitTests/ASSnapshotTestCase.mm
View File

@@ -7,6 +7,7 @@
*/
#import "ASSnapshotTestCase.h"
#import "ASDisplayNode+FrameworkPrivate.h"
#import "ASDisplayNodeInternal.h"
@implementation ASSnapshotTestCase
@@ -46,6 +47,7 @@
+ (void)hackilySynchronouslyRecursivelyRenderNode:(ASDisplayNode *)node
{
// TODO: Reconfigure this to be able to use [node recursivelyEnsureDisplay];
[self _recursivelySetDisplaysAsynchronously:NO forNode:node];
[self _recursivelyLayoutAndDisplayNode:node];
}