Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2018-10-07 11:45:43 +01:00
5 changed files with 20 additions and 7 deletions

View File

@@ -412,7 +412,7 @@ describe("api/editor/library", function() {
throw err;
}
res.body.should.have.property('sendFile',
'node-module:example-one');
fspath.resolve('node-module') + ':example-one');
done();
});
});
@@ -430,7 +430,8 @@ describe("api/editor/library", function() {
throw err;
}
res.body.should.have.property('sendFile',
'@org_scope/node_package:example-one');
fspath.resolve('@org_scope/node_package') +
':example-one');
done();
});
});