Merge pull request #294 from ever-co/fix/export-yaml-flat

Fix/YAML flat export unit test issue
ever-co · Jan 31, 2022 · c1725f3 · c1725f3
2 parents 7ed16dc + a235ba8
commit c1725f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/api/src/formatters/fixtures/simple-flat.yaml b/api/src/formatters/fixtures/simple-flat.yaml
@@ -1,4 +1,4 @@
 term.one: 'Current Plan: {{ project.plan.name }}'
 term two: '{VAR_PLURAL, plural, =0 {locales} =1 {locale} other {locales} }'
 TERM_THREE: Export format...
-'term:four': hello there you\nthis should be in a newline
+term:four: hello there you\nthis should be in a newline
diff --git a/api/src/formatters/fixtures/simple-nested.yaml b/api/src/formatters/fixtures/simple-nested.yaml
@@ -2,4 +2,4 @@ term:
   one: 'Current Plan: {{ project.plan.name }}'
 term two: '{VAR_PLURAL, plural, =0 {locales} =1 {locale} other {locales} }'
 TERM_THREE: Export format...
-'term:four': hello there you\nthis should be in a newline
+term:four: hello there you\nthis should be in a newline
diff --git a/api/src/formatters/yaml-flat.spec.ts b/api/src/formatters/yaml-flat.spec.ts
@@ -49,7 +49,7 @@ test('should fail if file is malformed, invalid or empty', async () => {
 });
 
 test('should export yaml files', async () => {
-  const result = await yamlFlatExporter(simpleFormatFixture);
-  const expected = loadFixture('simple-flat.yaml');
+  const result = (await yamlFlatExporter(simpleFormatFixture)).toString().split(/\r?\n/).filter(Boolean);
+  const expected = loadFixture('simple-flat.yaml').split(/\r?\n/).filter(Boolean);
   expect(result).toEqual(expected);
 });
diff --git a/api/src/formatters/yaml-nested.spec.ts b/api/src/formatters/yaml-nested.spec.ts
@@ -49,7 +49,7 @@ test('should fail if file is malformed, invalid or empty', async () => {
 });
 
 test('should export yaml nested files', async () => {
-  const result = await yamlNestedExporter(simpleFormatFixture);
-  const expected = loadFixture('simple-nested.yaml');
+  const result = (await yamlNestedExporter(simpleFormatFixture)).toString().split(/\r?\n/).filter(Boolean);
+  const expected = loadFixture('simple-nested.yaml').split(/\r?\n/).filter(Boolean);
   expect(result).toEqual(expected);
 });