From 960300c321de4ae12cc1be2bf2a7137e6994e227 Mon Sep 17 00:00:00 2001 From: sanex Date: Tue, 6 Oct 2020 14:49:55 +0300 Subject: [PATCH] Fixed line separators in tests of `CommentsTransformer` and `HashbangOperatorTransformer` --- .../HashbangOperatorTransformer.spec.ts | 8 +++++--- .../CommentsTransformer.spec.ts | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/test/functional-tests/code-transformers/preparing-transformers/hashbang-operator-transformer/HashbangOperatorTransformer.spec.ts b/test/functional-tests/code-transformers/preparing-transformers/hashbang-operator-transformer/HashbangOperatorTransformer.spec.ts index eebfa066..77c86a2a 100644 --- a/test/functional-tests/code-transformers/preparing-transformers/hashbang-operator-transformer/HashbangOperatorTransformer.spec.ts +++ b/test/functional-tests/code-transformers/preparing-transformers/hashbang-operator-transformer/HashbangOperatorTransformer.spec.ts @@ -7,9 +7,11 @@ import { readFileAsString } from '../../../../helpers/readFileAsString'; import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade'; describe('HashbangOperatorTransformer', () => { + const lineSeparator: string = '\r?\n'; + describe('Variant #1: simple', () => { const regExp: RegExp = new RegExp( - `^#!\/usr\/bin\/env node\n` + + `^#!\/usr\/bin\/env node${lineSeparator}` + `var foo *= *'abc';` ); @@ -33,7 +35,7 @@ describe('HashbangOperatorTransformer', () => { describe('Variant #2: multiple new lines', () => { const regExp: RegExp = new RegExp( - `^#!\/usr\/bin\/env node\n\n\n\n` + + `^#!\/usr\/bin\/env node${lineSeparator.repeat(4)}` + `var foo *= *'abc';` ); @@ -57,7 +59,7 @@ describe('HashbangOperatorTransformer', () => { describe('Variant #3: `stringArray` option enabled', () => { const regExp: RegExp = new RegExp( - `^#!\/usr\/bin\/env node\n` + + `^#!\/usr\/bin\/env node${lineSeparator}` + `var _0x(\\w){4} *= *\\['abc'];` ); diff --git a/test/functional-tests/node-transformers/initializing-transformers/comments-transformer/CommentsTransformer.spec.ts b/test/functional-tests/node-transformers/initializing-transformers/comments-transformer/CommentsTransformer.spec.ts index 9468347d..11c58773 100644 --- a/test/functional-tests/node-transformers/initializing-transformers/comments-transformer/CommentsTransformer.spec.ts +++ b/test/functional-tests/node-transformers/initializing-transformers/comments-transformer/CommentsTransformer.spec.ts @@ -7,6 +7,8 @@ import { readFileAsString } from '../../../../helpers/readFileAsString'; import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade'; describe('CommentsTransformer', () => { + const lineSeparatorEscaped: string = '\\r?\\n'; + describe('Variant #1: simple comment without preserved words', () => { const regExp: RegExp = /^var test *= *0x1;$/; @@ -72,10 +74,10 @@ describe('CommentsTransformer', () => { describe('Variant #4: comment with preserved and non-preserved words', () => { const regExp: RegExp = new RegExp(``+ - `^\\/\\*\\* *\\n` + - ` *\\* *@license *\\n` + - ` *\\* *test\\n` + - ` *\\*\\/\\n` + + `^\\/\\*\\* *${lineSeparatorEscaped}` + + ` *\\* *@license *${lineSeparatorEscaped}` + + ` *\\* *test${lineSeparatorEscaped}` + + ` *\\*\\/${lineSeparatorEscaped}` + `var test *= *0x1;` + ` *\\/\\*\\* *@preserved *\\*\\/$` + ``); @@ -117,7 +119,7 @@ describe('CommentsTransformer', () => { }); }); - describe('Variant #5: only comment with preserved words', () => { + describe('Variant #6: only comment with preserved words', () => { const regExp: RegExp = /^\/\/ *@license$/; let obfuscatedCode: string; @@ -138,7 +140,7 @@ describe('CommentsTransformer', () => { }); }); - describe('Variant #6: simple comment with preserved words and additional code helper is inserted', () => { + describe('Variant #7: simple comment with preserved words and additional code helper is inserted', () => { describe('Variant #1: `stringArray` code helper', () => { const regExp: RegExp = /^\/\/ *@license *test *comment *\n*var _0x([a-f0-9]){4} *= *\['abc'];/;