Skip to content

Commit 9f3c4c9

Browse files
committed
fix(unit tests): Fix more tests
1 parent 5cc8703 commit 9f3c4c9

File tree

6 files changed

+31
-38
lines changed

6 files changed

+31
-38
lines changed

core/lib/parameter_hunter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ const parameter_hunter = function () {
254254

255255
//find the partial's name and retrieve it
256256
const partialName = pMatch.match(/([\w\-\.\/~]+)/g)[0];
257-
const partialPattern = jsonCopy(getPartial(path.normalize(partialName), patternlab, `partial pattern ${partialName}`));
257+
const partialPattern = jsonCopy(getPartial(partialName, patternlab, `partial pattern ${partialName}`));
258258

259259
//if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
260260
if (!partialPattern.extendedTemplate) {

test/files/_patterns/00-test/sticky-comment-full.mustache

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{> 00-test\comment(description: 'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.') }}
1+
{{> 00-test/comment(description: 'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.') }}

test/get_tests.js

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const getPartial = require('../core/lib/get');
77

88
const patterns_dir = './test/files/_patterns';
99

10-
tap.test('get_pattern_by_key - returns the fuzzy result when no others found', function (test) {
10+
tap.test('getPartial - returns the fuzzy result when no others found', function (test) {
1111
//arrange
1212
const patternlab = util.fakePatternLab(patterns_dir);
1313
patternlab.patterns = [];
@@ -27,7 +27,32 @@ tap.test('get_pattern_by_key - returns the fuzzy result when no others found', f
2727
test.end();
2828
});
2929

30-
tap.test('get_pattern_by_key - returns the exact key if found', function (test) {
30+
tap.test('getPartial - returns the verbose result if found', function (test) {
31+
//arrange
32+
const patternlab = util.fakePatternLab(patterns_dir);
33+
patternlab.patterns = [];
34+
35+
patternlab.patterns.push({
36+
patternPartial: 'molecules-primary-nav-jagged',
37+
subdir: 'molecules',
38+
fileName: 'primary-nav-jagged',
39+
verbosePartial: 'molecules/primary-nav-jagged'
40+
}, {
41+
patternPartial: 'molecules-primary-nav',
42+
subdir: 'molecules',
43+
fileName: 'molecules-primary-nav',
44+
verbosePartial: 'molecules/primary-nav'
45+
});
46+
47+
//act
48+
var result = getPartial('molecules/primary-nav', patternlab);
49+
50+
//assert
51+
test.equals(result, patternlab.patterns[1]);
52+
test.end();
53+
});
54+
55+
tap.test('getPartial - returns the exact key if found', function (test) {
3156
//arrange
3257
const patternlab = util.fakePatternLab(patterns_dir);
3358
patternlab.patterns = [];

test/index_tests.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,6 @@ tap.test('buildPatterns', function () {
9494
test.equals(util.sanitized(pattern.patternPartialCode), util.sanitized(`<h1></h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>`));
9595
test.end();
9696
});
97-
98-
tap.test('parameter hunter finds and extends templates with fully-pathed partials', function (test) {
99-
var pattern = get('test-sticky-comment-full', patternlab);
100-
test.equals(util.sanitized(pattern.patternPartialCode), util.sanitized(`<h1></h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>`));
101-
test.end();
102-
});
103-
104-
10597
}
10698
};
10799

test/parameter_hunter_tests.js

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tap.test('parameter hunter finds and extends templates', function (test) {
3939
}).catch(test.threw);
4040
});
4141

42-
tap.only('parameter hunter finds and extends templates with verbose partials', function (test) {
42+
tap.test('parameter hunter finds and extends templates with verbose partials', function (test) {
4343
//arrange
4444
const pl = util.fakePatternLab(testPatternsPath);
4545

@@ -56,35 +56,12 @@ tap.only('parameter hunter finds and extends templates with verbose partials', f
5656
//act
5757
parameter_hunter.find_parameters(testPattern, pl).then(() => {
5858
//assert
59-
test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1></h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>'));
59+
test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>'));
6060
test.end();
6161
}).catch(test.threw);
6262
}).catch(test.threw);
6363
});
6464

65-
tap.test('parameter hunter finds and extends templates with fully-pathed partials', function(test) {
66-
//arrange
67-
const pl = util.fakePatternLab(testPatternsPath);
68-
69-
var commentPath = path.join('00-test', 'comment.mustache');
70-
var commentPattern = loadPattern(commentPath, pl);
71-
72-
var testPatternPath = path.join('00-test', 'sticky-comment-full.mustache');
73-
var testPattern = loadPattern(testPatternPath, pl);
74-
75-
var p1 = processIterative(commentPattern, pl);
76-
var p2 = processIterative(testPattern, pl);
77-
78-
Promise.all([p1, p2]).then(() => {
79-
//act
80-
parameter_hunter.find_parameters(testPattern, pl).then(() => {
81-
//assert
82-
test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1></h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>'));
83-
test.end();
84-
});
85-
});
86-
});
87-
8865
//previous tests were for unquoted parameter keys and single-quoted values.
8966
//test other quoting options.
9067
tap.test('parameter hunter parses parameters with unquoted keys and unquoted values', function (test) {

0 commit comments

Comments
 (0)