Skip to content

Commit

Permalink
Merge pull request #90 from rondale-sc/use-tagged-templates-with-hbs-…
Browse files Browse the repository at this point in the history
…helper-rather-than-literals

Use template strings intstead of string literals with htmbars-inline-precompile
  • Loading branch information
rwjblue authored Nov 5, 2018
2 parents de88eca + b38310c commit 9ea48e6
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 54 deletions.
14 changes: 7 additions & 7 deletions tests/unit/helpers/and-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,50 +7,50 @@ module('helper:and', function(hooks) {
setupRenderingTest(hooks);

test('boolean values', async function(assert) {
await render(hbs("[{{and true true}}] [{{and true false}}] [{{and false true}}] [{{and false false}}]"));
await render(hbs`[{{and true true}}] [{{and true false}}] [{{and false true}}] [{{and false false}}]`);

assert.equal(find('*').textContent, '[true] [false] [false] [false]', 'value should be "[true] [false] [false] [false]"');
});

test('integer values', async function(assert) {
await render(hbs("[{{and 1 1}}] [{{and 1 0}}] [{{and 0 1}}] [{{and 0 0}}]"));
await render(hbs`[{{and 1 1}}] [{{and 1 0}}] [{{and 0 1}}] [{{and 0 0}}]`);

assert.equal(find('*').textContent, '[1] [0] [0] [0]', 'value should be "[1] [0] [0] [0]"');
});

test('string values', async function(assert) {
await render(hbs('[{{and " " " "}}] [{{and " " ""}}] [{{and "" " "}}] [{{and "" ""}}]'));
await render(hbs`[{{and " " " "}}] [{{and " " ""}}] [{{and "" " "}}] [{{and "" ""}}]`);

assert.equal(find('*').textContent, '[ ] [] [] []', 'value should be "[ ] [] [] []"');
});


test('undefined list length and boolean', async function(assert) {
await render(hbs('[{{and array.length 1}}]'));
await render(hbs`[{{and array.length 1}}]`);

assert.equal(find('*').textContent, '[]', 'value should be "[]"');
});

test('null list length and boolean', async function(assert) {
this.set('array', null);

await render(hbs('[{{and array.length 1}}]'));
await render(hbs`[{{and array.length 1}}]`);

assert.equal(find('*').textContent, '[]', 'value should be "[]"');
});

test('empty list length and boolean', async function(assert) {
this.set('array', []);

await render(hbs('[{{and array.length 1}}]'));
await render(hbs`[{{and array.length 1}}]`);

assert.equal(find('*').textContent, '[0]', 'value should be "[0]"');
});

test('non-empty list length and boolean', async function(assert) {
this.set('array', ['a']);

await render(hbs('[{{and array.length 2}}]'));
await render(hbs`[{{and array.length 2}}]`);

assert.equal(find('*').textContent, '[2]', 'value should be "[2]"');
});
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/helpers/equal-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module('helper:eq', function(hooks) {
setupRenderingTest(hooks);

test('simple test 1', async function(assert) {
await render(hbs("[{{eq true true}}] [{{eq true false}}] [{{eq false true}}] [{{eq false false}}]"));
await render(hbs`[{{eq true true}}] [{{eq true false}}] [{{eq false true}}] [{{eq false false}}]`);

assert.equal(find('*').textContent, '[true] [false] [false] [true]', 'value should be "[true] [false] [false] [true]"');
});
Expand All @@ -23,7 +23,7 @@ module('helper:eq', function(hooks) {
this.set('contextChild', fakeContextObject);

await render(
hbs("[{{eq contextChild.valueA contextChild.valueB}}] [{{eq contextChild.valueB contextChild.valueA}}]")
hbs`[{{eq contextChild.valueA contextChild.valueB}}] [{{eq contextChild.valueB contextChild.valueA}}]`
);

assert.equal(find('*').textContent, '[true] [true]', 'value should be "[true] [true]"');
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/helpers/gt-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@ module('helper:gt', function(hooks) {
setupRenderingTest(hooks);

test('boolean values', async function(assert) {
await render(hbs(("[{{gt true true}}] [{{gt true false}}] [{{gt false true}}] [{{gt false false}}]")));
await render(hbs`[{{gt true true}}] [{{gt true false}}] [{{gt false true}}] [{{gt false false}}]`);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
});

test('integer values', async function(assert) {
await render(hbs("[{{gt 1 1}}] [{{gt 1 0}}] [{{gt 0 1}}] [{{gt 0 0}}]"));
await render(hbs`[{{gt 1 1}}] [{{gt 1 0}}] [{{gt 0 1}}] [{{gt 0 0}}]`);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
});

test('decimal values', async function(assert) {
await render(hbs("[{{gt 19.2 19.2}}] [{{gt 19.2 3.55}}] [{{gt 3.55 19.2}}] [{{gt 3.55 3.55}}]"));
await render(hbs`[{{gt 19.2 19.2}}] [{{gt 19.2 3.55}}] [{{gt 3.55 19.2}}] [{{gt 3.55 3.55}}]`);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
});

test('integers in strings 1', async function(assert) {
await render(
hbs("[{{gt '1' '1' forceNumber=true}}] [{{gt '1' '0' forceNumber=true}}] [{{gt '0' '1' forceNumber=true}}] [{{gt '0' '0' forceNumber=true}}]")
hbs`[{{gt '1' '1' forceNumber=true}}] [{{gt '1' '0' forceNumber=true}}] [{{gt '0' '1' forceNumber=true}}] [{{gt '0' '0' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
});

test('integers in strings 2', async function(assert) {
await render(
hbs("[{{gt '102' '102' forceNumber=true}}] [{{gt '102' '98' forceNumber=true}}] [{{gt '98' '102' forceNumber=true}}] [{{gt '98' '98' forceNumber=true}}]")
hbs`[{{gt '102' '102' forceNumber=true}}] [{{gt '102' '98' forceNumber=true}}] [{{gt '98' '102' forceNumber=true}}] [{{gt '98' '98' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
});

test('decimals in strings', async function(assert) {
await render(
hbs("[{{gt '19.2' '19.2' forceNumber=true}}] [{{gt '19.2' '3.55' forceNumber=true}}] [{{gt '3.55' '19.2' forceNumber=true}}] [{{gt '3.55' '3.55' forceNumber=true}}]")
hbs`[{{gt '19.2' '19.2' forceNumber=true}}] [{{gt '19.2' '3.55' forceNumber=true}}] [{{gt '3.55' '19.2' forceNumber=true}}] [{{gt '3.55' '3.55' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [true] [false] [false]', 'value should be "[false] [true] [false] [false]"');
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/helpers/gte-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@ module('helper:gte', function(hooks) {
setupRenderingTest(hooks);

test('boolean values', async function(assert) {
await render(hbs("[{{gte true true}}] [{{gte true false}}] [{{gte false true}}] [{{gte false false}}]"));
await render(hbs`[{{gte true true}}] [{{gte true false}}] [{{gte false true}}] [{{gte false false}}]`);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[false] [true] [false] [true]"');
});

test('integer values', async function(assert) {
await render(hbs("[{{gte 1 1}}] [{{gte 1 0}}] [{{gte 0 1}}] [{{gte 0 0}}]"));
await render(hbs`[{{gte 1 1}}] [{{gte 1 0}}] [{{gte 0 1}}] [{{gte 0 0}}]`);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[true] [true] [false] [true]"');
});

test('decimal values', async function(assert) {
await render(hbs("[{{gte 19.2 19.2}}] [{{gte 19.2 3.55}}] [{{gte 3.55 19.2}}] [{{gte 3.55 3.55}}]"));
await render(hbs`[{{gte 19.2 19.2}}] [{{gte 19.2 3.55}}] [{{gte 3.55 19.2}}] [{{gte 3.55 3.55}}]`);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[true] [true] [false] [true]"');
});

test('integers in strings 1', async function(assert) {
await render(
hbs("[{{gte '1' '1' forceNumber=true}}] [{{gte '1' '0' forceNumber=true}}] [{{gte '0' '1' forceNumber=true}}] [{{gte '0' '0' forceNumber=true}}]")
hbs`[{{gte '1' '1' forceNumber=true}}] [{{gte '1' '0' forceNumber=true}}] [{{gte '0' '1' forceNumber=true}}] [{{gte '0' '0' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[true] [true] [false] [true]"');
});

test('integers in strings 2', async function(assert) {
await render(
hbs("[{{gte '102' '102' forceNumber=true}}] [{{gte '102' '98' forceNumber=true}}] [{{gte '98' '102' forceNumber=true}}] [{{gte '98' '98' forceNumber=true}}]")
hbs`[{{gte '102' '102' forceNumber=true}}] [{{gte '102' '98' forceNumber=true}}] [{{gte '98' '102' forceNumber=true}}] [{{gte '98' '98' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[true] [true] [false] [true]"');
});

test('decimals in strings', async function(assert) {
await render(
hbs("[{{gte '19.2' '19.2' forceNumber=true}}] [{{gte '19.2' '3.55' forceNumber=true}}] [{{gte '3.55' '19.2' forceNumber=true}}] [{{gte '3.55' '3.55' forceNumber=true}}]")
hbs`[{{gte '19.2' '19.2' forceNumber=true}}] [{{gte '19.2' '3.55' forceNumber=true}}] [{{gte '3.55' '19.2' forceNumber=true}}] [{{gte '3.55' '3.55' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [true] [false] [true]', 'value should be "[true] [true] [false] [true]"');
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/helpers/is-array-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module('helper:is-array', function(hooks) {
this.set('contextChild', fakeContextObject);

await render(
hbs("[{{is-array contextChild.valueA}}] [{{is-array contextChild.valueB}}] [{{is-array contextChild.valueA contextChild.valueB}}]")
hbs`[{{is-array contextChild.valueA}}] [{{is-array contextChild.valueB}}] [{{is-array contextChild.valueA contextChild.valueB}}]`
);

assert.equal(find('*').textContent, '[false] [false] [false]', 'value should be "[false] [false] [false]"');
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/helpers/is-empty-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ module('helper:is-empty', function(hooks) {
this.set('thisIsUndefined', undefined)
this.set('thisIsNull', null)
this.set('thisIsNotNull', new Date())
await render(hbs("[{{is-empty thisIsUndefined}}] [{{is-empty thisIsNull}}] [{{is-empty thisIsNotNull}}]"));
await render(hbs`[{{is-empty thisIsUndefined}}] [{{is-empty thisIsNull}}] [{{is-empty thisIsNotNull}}]`);

assert.equal(find('*').textContent, '[true] [true] [false]', 'value should be "[true] [true] [false]"');
});

test('boolean values', async function(assert) {
await render(hbs("[{{is-empty true}}] [{{is-empty false}}]"));
await render(hbs`[{{is-empty true}}] [{{is-empty false}}]`);

assert.equal(find('*').textContent, '[false] [false]', 'value should be "[false] [false]"');
});

test('objects', async function(assert) {
this.set('emptyObject', {})
this.set('notEmptyObject', { some: 'object' })
await render(hbs("[{{is-empty emptyObject}}] [{{is-empty notEmptyObject}}]"));
await render(hbs`[{{is-empty emptyObject}}] [{{is-empty notEmptyObject}}]`);

assert.equal(find('*').textContent, '[false] [false]', 'value should be "[false] [false]"');
});

test('arrays', async function(assert) {
this.set('emptyArray', [])
this.set('notEmptyArray', [ 'a', 8, {} ])
await render(hbs("[{{is-empty emptyArray}}] [{{is-empty notEmptyArray}}]"));
await render(hbs`[{{is-empty emptyArray}}] [{{is-empty notEmptyArray}}]`);

assert.equal(find('*').textContent, '[true] [false]', 'value should be "[true] [false]"');
});
Expand All @@ -41,7 +41,7 @@ module('helper:is-empty', function(hooks) {
this.set('emptyString', '')
this.set('whitespaceString', ' ')
this.set('notEmptyString', 'full of text')
await render(hbs("[{{is-empty emptyString}}] [{{is-empty whitespaceString}}] [{{is-empty notEmptyString}}]"));
await render(hbs`[{{is-empty emptyString}}] [{{is-empty whitespaceString}}] [{{is-empty notEmptyString}}]`);

assert.equal(find('*').textContent, '[true] [false] [false]', 'value should be "[true] [false] [false]"');
});
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/helpers/is-equal-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module('helper:is-equal', function(hooks) {
});

await render(
hbs("[{{is-equal complex 12}}] [{{is-equal complex 13}}] [{{is-equal 13 complex}}] [{{is-equal 12 complex}}]")
hbs`[{{is-equal complex 12}}] [{{is-equal complex 13}}] [{{is-equal 13 complex}}] [{{is-equal 12 complex}}]`
);

assert.equal(find('*').textContent, '[true] [false] [false] [false]', 'value should be "[true] [false] [false] [false]"');
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/helpers/lt-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@ module('helper:lt', function(hooks) {

// Replace this with your real tests.
test('boolean values', async function(assert) {
await render(hbs("[{{lt true true}}] [{{lt true false}}] [{{lt false true}}] [{{lt false false}}]"));
await render(hbs`[{{lt true true}}] [{{lt true false}}] [{{lt false true}}] [{{lt false false}}]`);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
});

test('integer values', async function(assert) {
await render(hbs("[{{lt 1 1}}] [{{lt 1 0}}] [{{lt 0 1}}] [{{lt 0 0}}]"));
await render(hbs`[{{lt 1 1}}] [{{lt 1 0}}] [{{lt 0 1}}] [{{lt 0 0}}]`);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
});

test('decimal values', async function(assert) {
await render(hbs("[{{lt 19.2 19.2}}] [{{lt 19.2 3.55}}] [{{lt 3.55 19.2}}] [{{lt 3.55 3.55}}]"));
await render(hbs`[{{lt 19.2 19.2}}] [{{lt 19.2 3.55}}] [{{lt 3.55 19.2}}] [{{lt 3.55 3.55}}]`);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
});

test('integers in strings 1', async function(assert) {
await render(
hbs("[{{lt '1' '1' forceNumber=true}}] [{{lt '1' '0' forceNumber=true}}] [{{lt '0' '1' forceNumber=true}}] [{{lt '0' '0' forceNumber=true}}]")
hbs`[{{lt '1' '1' forceNumber=true}}] [{{lt '1' '0' forceNumber=true}}] [{{lt '0' '1' forceNumber=true}}] [{{lt '0' '0' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
});

test('integers in strings 2', async function(assert) {
await render(
hbs("[{{lt '102' '102' forceNumber=true}}] [{{lt '102' '98' forceNumber=true}}] [{{lt '98' '102' forceNumber=true}}] [{{lt '98' '98' forceNumber=true}}]")
hbs`[{{lt '102' '102' forceNumber=true}}] [{{lt '102' '98' forceNumber=true}}] [{{lt '98' '102' forceNumber=true}}] [{{lt '98' '98' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
});

test('decimals in strings', async function(assert) {
await render(
hbs("[{{lt '19.2' '19.2' forceNumber=true}}] [{{lt '19.2' '3.55' forceNumber=true}}] [{{lt '3.55' '19.2' forceNumber=true}}] [{{lt '3.55' '3.55' forceNumber=true}}]")
hbs`[{{lt '19.2' '19.2' forceNumber=true}}] [{{lt '19.2' '3.55' forceNumber=true}}] [{{lt '3.55' '19.2' forceNumber=true}}] [{{lt '3.55' '3.55' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/helpers/lte-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@ module('helper:lte', function(hooks) {

// Replace this with your real tests.
test('boolean values', async function(assert) {
await render(hbs("[{{lte true true}}] [{{lte true false}}] [{{lte false true}}] [{{lte false false}}]"));
await render(hbs`[{{lte true true}}] [{{lte true false}}] [{{lte false true}}] [{{lte false false}}]`);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
});

test('integer values', async function(assert) {
await render(hbs("[{{lte 1 1}}] [{{lte 1 0}}] [{{lte 0 1}}] [{{lte 0 0}}]"));
await render(hbs`[{{lte 1 1}}] [{{lte 1 0}}] [{{lte 0 1}}] [{{lte 0 0}}]`);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
});

test('decimal values', async function(assert) {
await render(hbs("[{{lte 19.2 19.2}}] [{{lte 19.2 3.55}}] [{{lte 3.55 19.2}}] [{{lte 3.55 3.55}}]"));
await render(hbs`[{{lte 19.2 19.2}}] [{{lte 19.2 3.55}}] [{{lte 3.55 19.2}}] [{{lte 3.55 3.55}}]`);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
});

test('integers in strings 1', async function(assert) {
await render(
hbs("[{{lte '1' '1' forceNumber=true}}] [{{lte '1' '0' forceNumber=true}}] [{{lte '0' '1' forceNumber=true}}] [{{lte '0' '0' forceNumber=true}}]")
hbs`[{{lte '1' '1' forceNumber=true}}] [{{lte '1' '0' forceNumber=true}}] [{{lte '0' '1' forceNumber=true}}] [{{lte '0' '0' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
});

test('integers in strings 2', async function(assert) {
await render(
hbs("[{{lte '102' '102' forceNumber=true}}] [{{lte '102' '98' forceNumber=true}}] [{{lte '98' '102' forceNumber=true}}] [{{lte '98' '98' forceNumber=true}}]")
hbs`[{{lte '102' '102' forceNumber=true}}] [{{lte '102' '98' forceNumber=true}}] [{{lte '98' '102' forceNumber=true}}] [{{lte '98' '98' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
});

test('decimals in strings', async function(assert) {
await render(
hbs("[{{lte '19.2' '19.2' forceNumber=true}}] [{{lte '19.2' '3.55' forceNumber=true}}] [{{lte '3.55' '19.2' forceNumber=true}}] [{{lte '3.55' '3.55' forceNumber=true}}]")
hbs`[{{lte '19.2' '19.2' forceNumber=true}}] [{{lte '19.2' '3.55' forceNumber=true}}] [{{lte '3.55' '19.2' forceNumber=true}}] [{{lte '3.55' '3.55' forceNumber=true}}]`
);

assert.equal(find('*').textContent, '[true] [false] [true] [true]', 'value should be "[false] [false] [true] [true]"');
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/helpers/not-equal-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module('helper:not-equal', function(hooks) {

test('simple test 1', async function(assert) {
await render(
hbs("[{{not-eq true true}}] [{{not-eq true false}}] [{{not-eq false true}}] [{{not-eq false false}}]")
hbs`[{{not-eq true true}}] [{{not-eq true false}}] [{{not-eq false true}}] [{{not-eq false false}}]`
);

assert.equal(find('*').textContent, '[false] [true] [true] [false]', 'value should be "[false] [true] [true] [false]"');
Expand All @@ -25,7 +25,7 @@ module('helper:not-equal', function(hooks) {
this.set('contextChild', fakeContextObject);

await render(
hbs("[{{not-eq contextChild.valueA contextChild.valueB}}] [{{not-eq contextChild.valueB contextChild.valueA}}]")
hbs`[{{not-eq contextChild.valueA contextChild.valueB}}] [{{not-eq contextChild.valueB contextChild.valueA}}]`
);

assert.equal(find('*').textContent, '[false] [false]', 'value should be "[false] [false]"');
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/helpers/not-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ module('helper:not', function(hooks) {
setupRenderingTest(hooks);

test('simple test 1', async function(assert) {
await render(hbs("[{{not true}}] [{{not false}}] [{{not null}}] [{{not undefined}}] [{{not ''}}] [{{not ' '}}]"));
await render(hbs`[{{not true}}] [{{not false}}] [{{not null}}] [{{not undefined}}] [{{not ''}}] [{{not ' '}}]`);

assert.equal(find('*').textContent, '[false] [true] [true] [true] [true] [false]', 'value should be "[false] [true] [true] [true] [true] [false]"');
});

test('simple test 2', async function(assert) {
await render(
hbs("[{{not true false}}] [{{not true false}}] [{{not null null false null}}] [{{not false null ' ' true}}]")
hbs`[{{not true false}}] [{{not true false}}] [{{not null null false null}}] [{{not false null ' ' true}}]`
);

assert.equal(find('*').textContent, '[false] [false] [true] [false]', 'value should be "[false] [false] [true] [false]"');
Expand Down
Loading

0 comments on commit 9ea48e6

Please sign in to comment.