Skip to content

Commit f4c4850

Browse files
committed
Box: move extensions from namespace to box
1 parent 065c48c commit f4c4850

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

ext/-test-/box/yay1/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
create_makefile('-test-/namespace/yay1')
1+
create_makefile('-test-/box/yay1')

ext/-test-/box/yay2/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
create_makefile('-test-/namespace/yay2')
1+
create_makefile('-test-/box/yay2')

test/-ext-/box/test_load_ext.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def test_load_extension
88
pend
99
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
1010
begin;
11-
require '-test-/namespace/yay1'
11+
require '-test-/box/yay1'
1212
assert_equal "1.0.0", Yay.version
1313
assert_equal "yay", Yay.yay
1414
end;
@@ -18,24 +18,24 @@ def test_extension_contamination_in_global
1818
pend
1919
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", ignore_stderr: true)
2020
begin;
21-
require '-test-/namespace/yay1'
21+
require '-test-/box/yay1'
2222
yay1 = Yay
2323
assert_equal "1.0.0", Yay.version
2424
assert_equal "yay", Yay.yay
2525
26-
require '-test-/namespace/yay2'
26+
require '-test-/box/yay2'
2727
assert_equal "2.0.0", Yay.version
2828
v = Yay.yay
2929
assert(v == "yay" || v == "yaaay") # "yay" on Linux, "yaaay" on macOS, Win32
3030
end;
3131
end
3232

33-
def test_load_extension_in_namespace
33+
def test_load_extension_in_box
3434
pend
3535
assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
3636
begin;
37-
ns = Namespace.new
38-
ns.require '-test-/namespace/yay1'
37+
ns = Ruby::Box.new
38+
ns.require '-test-/box/yay1'
3939
assert_equal "1.0.0", ns::Yay.version
4040
assert_raise(NameError) { Yay }
4141
end;
@@ -45,10 +45,10 @@ def test_different_version_extensions
4545
pend
4646
assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
4747
begin;
48-
ns1 = Namespace.new
49-
ns2 = Namespace.new
50-
ns1.require('-test-/namespace/yay1')
51-
ns2.require('-test-/namespace/yay2')
48+
ns1 = Ruby::Box.new
49+
ns2 = Ruby::Box.new
50+
ns1.require('-test-/box/yay1')
51+
ns2.require('-test-/box/yay2')
5252
5353
assert_raise(NameError) { Yay }
5454
assert_not_nil ns1::Yay
@@ -64,12 +64,12 @@ def test_loading_extensions_from_global_to_local
6464
pend
6565
assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
6666
begin;
67-
require '-test-/namespace/yay1'
67+
require '-test-/box/yay1'
6868
assert_equal "1.0.0", Yay.version
6969
assert_equal "yay", Yay.yay
7070
71-
ns = Namespace.new
72-
ns.require '-test-/namespace/yay2'
71+
ns = Ruby::Box.new
72+
ns.require '-test-/box/yay2'
7373
assert_equal "2.0.0", ns::Yay.version
7474
assert_equal "yaaay", ns::Yay.yay
7575
@@ -81,13 +81,13 @@ def test_loading_extensions_from_local_to_global
8181
pend
8282
assert_separately([ENV_ENABLE_NAMESPACE], "#{<<~"begin;"}\n#{<<~'end;'}")
8383
begin;
84-
ns = Namespace.new
85-
ns.require '-test-/namespace/yay1'
84+
ns = Ruby::Box.new
85+
ns.require '-test-/box/yay1'
8686
assert_equal "1.0.0", ns::Yay.version
8787
assert_equal "yay", ns::Yay.yay
8888
8989
90-
require '-test-/namespace/yay2'
90+
require '-test-/box/yay2'
9191
assert_equal "2.0.0", Yay.version
9292
assert_equal "yaaay", Yay.yay
9393

0 commit comments

Comments
 (0)