Skip to content

test:replace common.fixturesDir with commonfixtures #15832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
feons wants to merge 3 commits into from
Closed

test:replace common.fixturesDir with commonfixtures #15832

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86da827
test:replace common.fixturesDir with commonfixtures
feons Oct 6, 2017
b24167c
use fixtures.readSync
feons Oct 7, 2017
8adf249
style fix
feons Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions test/parallel/test-tls-net-connect-prefer-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
const common = require('../common');
const fixtures = require('../common/fixtures');

// This tests that both tls and net will ignore host and port if path is
// provided.
Expand Down Expand Up @@ -28,8 +29,8 @@ function mkServer(lib, tcp, cb) {
const args = [handler];
if (lib === tls) {
args.unshift({
cert: fs.readFileSync(`${common.fixturesDir}/test_cert.pem`),
key: fs.readFileSync(`${common.fixturesDir}/test_key.pem`)
cert: fs.readFileSync(fixtures.path('test_cert.pem')),
key: fs.readFileSync(fixtures.path('test_key.pem'))
Copy link
Copy Markdown
Contributor

@rmg rmg Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fixtures module has a helper that make this even simpler! Check out fixtures.readSync().

That should let you do key: fixtures.readSync('test_key.pem') instead.

});
}
const server = lib.createServer(...args);
Expand Down