Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/root.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ Root.prototype.load = function load(filename, options, callback) {
/* istanbul ignore if */
if (!callback)
return;
var cb = callback;
callback = null;
if (sync)
throw err;
var cb = callback;
Copy link

Choose a reason for hiding this comment

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

The style is internally consistent, so LGTM. But, it would be an improvement to use let / const to protect us from weird scope issues.

callback = null;
cb(err, root);
}

Expand Down
23 changes: 23 additions & 0 deletions tests/api_root.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,29 @@ tape.test("reflected roots", function(test) {
});
});

test.test(test.name + " - missing import", function(test) {
var root = new Root();
test.plan(2);
root.load("tests/data/badimport.proto", function(err) {
test.ok(err, "should return an error when an imported file does not exist");
test.match(err.toString(), /nonexistent\.proto/, "should mention the file name which was not found");
test.end();
});
});

test.test(test.name + " - missing import, sync load", function(test) {
var root = new Root();
test.plan(2);
try {
root.loadSync("tests/data/badimport.proto");
root.resolveAll();
} catch (err) {
test.ok(err, "should return an error when an imported file does not exist");
test.match(err.toString(), /nonexistent\.proto/, "should mention the file name which was not found");
}
test.end();
});

test.test(test.name + " - skipped", function(test) {
var root = new Root();
root.resolvePath = function() {
Expand Down
7 changes: 7 additions & 0 deletions tests/data/badimport.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

import "nonexistent.proto";

message Message {
NonExistent field = 1;
}