-
Notifications
You must be signed in to change notification settings - Fork 6.8k
test(tree): Add more tests for cdk-tree #8967
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One quick comment before I head for the bus
src/cdk/tree/tree.spec.ts
Outdated
CdkTreeAppWithTrigger, | ||
NestedCdkTreeAppWithTrigger, | ||
WhenNodeCdkTreeApp, | ||
WhenNodeNestedCdkTreeApp, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you break up these into separate describe blocks (similar to the mat-select tests)? Organized this way, Angular will compile each test component for every it
, which pretty dramatically slows down the tests (this is why IE11 has been timing out recently). This will also resolve the ComponentFixture
being any
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Please take a look. Thanks!
64aadc6
to
c81cda6
Compare
src/cdk/tree/tree.spec.ts
Outdated
treeControl: TreeControl<TestData> = new FlatTreeControl(this.getLevel, this.isExpandable); | ||
|
||
dataSource: FakeDataSource | null = new FakeDataSource(this.treeControl); | ||
|
||
@ViewChild(CdkTree) tree: CdkTree<TestData>; | ||
} | ||
|
||
function getNodes(treeElement: Element): Element[] { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move these helper functions above the test components?
src/cdk/tree/tree.spec.ts
Outdated
@ViewChild(CdkTree) tree: CdkTree<TestData>; | ||
} | ||
|
||
function getNodes(treeElement: Element): Element[] { | ||
return [].slice.call(treeElement.querySelectorAll('.cdk-tree-node'))!; | ||
} | ||
|
||
// TODO(tinayuangao): Add expectedNestedTreeToMatchContent | ||
function expectFlatTreeToMatchContent(treeElement: Element, expectedTreeContent: any[], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would just call these expectFlatTreeToMatch
and expectNestedTreeToMatch
src/cdk/tree/tree.spec.ts
Outdated
@@ -200,3 +720,34 @@ function expectFlatTreeToMatchContent(treeElement: Element, expectedTreeContent: | |||
fail(missedExpectations.join('\n')); | |||
} | |||
} | |||
|
|||
function expectNestedTreeToMatchContent(treeElement: Element, expectedTreeContent: any[], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed offline: let's try doing something like
/** Represents an indent for expectNestedTreeToMatch */
const _ = {};
expectNestedTreeToMatch(
['Root'],
[_, 'Under'],
[_, _, 'More under'],
);
aae0165
to
4c67df7
Compare
@jelbourn Comments addressed. Please take a look. Thanks! |
4c67df7
to
1be5930
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
No description provided.