Skip to content

Commit 993a258

Browse files
authored
Include PACKAGE_NAME in mocha_test entrypoint (#42)
1 parent f990afc commit 993a258

File tree

4 files changed

+28
-5
lines changed

4 files changed

+28
-5
lines changed

node/internal/mocha_test.bzl

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,21 @@ def mocha_test(
4040
visibility = visibility,
4141
deps = deps + [name + "_module"],
4242
)
43-
43+
44+
entrypoint = [
45+
"%s_modules" % name,
46+
"node_modules"
47+
]
48+
49+
if PACKAGE_NAME:
50+
entrypoint.insert(0, PACKAGE_NAME)
51+
entrypoint.append(PACKAGE_NAME)
52+
entrypoint.append("%s_module" % name)
53+
4454
native.sh_test(
4555
name = name,
4656
srcs = [script],
47-
args = args + [
48-
"{name}_modules/node_modules/{name}_module".format(name = name),
49-
],
57+
args = args + ["/".join(entrypoint)],
5058
data = [
5159
mocha_bin,
5260
name + "_modules",

node/internal/mocha_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
set -eu
22
external/mocha_modules/mocha_bin $@
3+

tests/mocha/src/main/js/BUILD

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11

22
package(default_visibility = ["//visibility:public"])
33

4-
load("@org_pubref_rules_node//node:rules.bzl", "node_module")
4+
load("@org_pubref_rules_node//node:rules.bzl", "node_module", "mocha_test")
55

66
node_module(
77
name = "greeter",
88
main = "greeter.js",
99
)
10+
11+
mocha_test(
12+
name = "greeter_test",
13+
main = "greeter_test.js",
14+
deps = [":greeter"],
15+
)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
var greet = require('src/main/js/greeter');
2+
var assert = require('assert');
3+
4+
describe('#greet()', function() {
5+
it('should say hello', function() {
6+
assert.equal('Hello World!', greet('World'));
7+
});
8+
});

0 commit comments

Comments
 (0)