Skip to content

Commit

Permalink
Merge branch 'master' into kriant.jsdocs
Browse files Browse the repository at this point in the history
  • Loading branch information
skad0 committed Feb 2, 2017
2 parents ef58709 + 068cbd3 commit 7bb2f19
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions test/assign.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ test('entity block should dominate scope’s one', t => {
{ entity: { block: 'b' }, tech: null });
});

test('entity block should correcly assign with block-elem from scope', t => {
t.deepEqual(simplifyCell(assign(
{ entity: { block: 'b' } },
{ entity: { block: 'sb', elem: 'se' } })),
{ entity: { block: 'b' }, tech: null });
});

test('entity block should correcly assign with block-mod from scope', t => {
t.deepEqual(simplifyCell(assign(
{ entity: { block: 'b' } },
{ entity: { block: 'sb', modName: 'sm', modVal: 'sv' } })),
{ entity: { block: 'b' }, tech: null });
});

test('entity elem should dominate scope’s one', t => {
t.deepEqual(simplifyCell(assign(
{ entity: { block: 'b', elem: 'e' } },
Expand Down

0 comments on commit 7bb2f19

Please sign in to comment.