Replace lingering `mealGraph`s in test case (#57)

Summary:
In merging #54, there was a semantic merge conflict that was not also a
textual merge conflict; this created a failure that only appeared once
that commit was merged.

We propose that to fix this in the future, we only merge commits that
are directly ahead of master.

Test Plan:
This fixes `yarn flow` and `yarn test`.

wchargin-branch: fix-merge-conflict
This commit is contained in:
William Chargin 2018-03-02 14:16:51 -08:00 committed by GitHub
parent 97446138ab
commit 58410c62fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -297,7 +297,7 @@ describe("graph", () => {
it("gets all nodes", () => { it("gets all nodes", () => {
const expected = [heroNode(), bananasNode(), crabNode(), mealNode()]; const expected = [heroNode(), bananasNode(), crabNode(), mealNode()];
const actual = mealGraph().getAllNodes(); const actual = advancedMealGraph().getAllNodes();
expectSameSorted(expected, actual); expectSameSorted(expected, actual);
}); });
@ -309,8 +309,10 @@ describe("graph", () => {
bananasIngredientEdge(), bananasIngredientEdge(),
crabIngredientEdge(), crabIngredientEdge(),
eatEdge(), eatEdge(),
crabLoopEdge(),
duplicateCookEdge(),
]; ];
const actual = mealGraph().getAllEdges(); const actual = advancedMealGraph().getAllEdges();
expectSameSorted(expected, actual); expectSameSorted(expected, actual);
}); });