Skip to content

Commit

Permalink
chore(tests): fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dbanksdesign committed Jul 20, 2020
1 parent 2e7d671 commit f71cd81
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions __tests__/utils/combineJSON.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ describe('utils', () => {

it('should do a deep merge', () => {
var test = combineJSON(["__tests__/__json_files/shallow/*.json"], true);
console.log(test);
expect(test).toHaveProperty('a', 2);
expect(test.b).toMatchObject({"a":1, "c":2})
expect(test).toHaveProperty('d.e.f.g', 1);
Expand All @@ -46,7 +45,6 @@ describe('utils', () => {

it('should do a shallow merge', () => {
var test = combineJSON(["__tests__/__json_files/shallow/*.json"]);
console.log(test);
expect(test).toHaveProperty('a', 2);
expect(test.b).toMatchObject({"c":2});
expect(test).toHaveProperty('c', [3,4]);
Expand Down
4 changes: 1 addition & 3 deletions lib/utils/combineJSON.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ function combineJSON(arr, deep, collision, source, parsers=[]) {
files = files.concat(new_files);
}

console.log(files);
for (i = 0; i < files.length; i++) {
var resolvedPath = resolveCwd(path.isAbsolute(files[i]) ? files[i] : './' + files[i]);
var file_content;
console.log(file_content);
var file_content = null;

try {
// This delete force require(resolvedPath) to take the latest version of the file. It's handfull when using the node package along chokidar.
Expand Down

0 comments on commit f71cd81

Please sign in to comment.