From 32bb62973385ec060a19513e7768da1bc46c786b Mon Sep 17 00:00:00 2001 From: matthewreed26 Date: Fri, 6 Oct 2017 13:22:24 -0400 Subject: [PATCH 1/2] replace common.fixtureDir with common.fixtures module path method --- test/parallel/test-common.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-common.js b/test/parallel/test-common.js index 647c39d939f2aa..9d2efbc4246976 100644 --- a/test/parallel/test-common.js +++ b/test/parallel/test-common.js @@ -21,6 +21,7 @@ 'use strict'; const common = require('../common'); +const fixtures = require('../common/fixtures') const assert = require('assert'); const { join } = require('path'); const { execFile } = require('child_process'); @@ -72,10 +73,10 @@ fnAtLeast2Called3(); const failFixtures = [ [ - join(common.fixturesDir, 'failmustcall1.js'), + fixtures.path('failmustcall1.js'), 'Mismatched function calls. Expected exactly 2, actual 1.' ], [ - join(common.fixturesDir, 'failmustcall2.js'), + fixtures.path('failmustcall2.js'), 'Mismatched function calls. Expected at least 2, actual 1.' ] ]; From 5675ef2d528f1e7a65693e8984198c4787f2efd7 Mon Sep 17 00:00:00 2001 From: matthewreed26 Date: Fri, 6 Oct 2017 13:30:47 -0400 Subject: [PATCH 2/2] removed join module and fixed linter problem --- test/parallel/test-common.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/parallel/test-common.js b/test/parallel/test-common.js index 9d2efbc4246976..7a73f93ae0f926 100644 --- a/test/parallel/test-common.js +++ b/test/parallel/test-common.js @@ -21,9 +21,8 @@ 'use strict'; const common = require('../common'); -const fixtures = require('../common/fixtures') +const fixtures = require('../common/fixtures'); const assert = require('assert'); -const { join } = require('path'); const { execFile } = require('child_process'); // test for leaked global detection