summaryrefslogtreecommitdiff
path: root/test/behaviour
diff options
context:
space:
mode:
Diffstat (limited to 'test/behaviour')
-rw-r--r--test/behaviour/addons.zig13
-rw-r--r--test/behaviour/plumber.zig2
2 files changed, 10 insertions, 5 deletions
diff --git a/test/behaviour/addons.zig b/test/behaviour/addons.zig
index 9b96a3d6..451cb1e3 100644
--- a/test/behaviour/addons.zig
+++ b/test/behaviour/addons.zig
@@ -185,7 +185,7 @@ test "addons: the image addon opens the pictures a Look names, fitted, with the
try std.testing.expect(has(try s.read("/screen"), "\"src\":[0,0,4,2]"));
}
-test "addons: a Plumb rule to a loaded kind opens that kind's pane, is refused naming one not loaded, and with its kind gone the look falls through to text" {
+test "addons: a plumbing rule to a loaded kind opens that kind's pane; to one not loaded, or with its kind gone, the look falls through to text" {
var s = try Session.initFile(std.testing.allocator, "x\n");
defer s.deinit();
try load(&s, Session.image_addon);
@@ -196,9 +196,14 @@ test "addons: a Plumb rule to a loaded kind opens that kind's pane, is refused n
// A PNG under a name no kind claims.
const png = "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x02\x00\x00\x00\x90wS\xde\x00\x00\x00\x0cIDATx\x9cc\xf8\xcf\xc0\x00\x00\x03\x01\x01\x00\xc9\xfe\x92\xef\x00\x00\x00\x00IEND\xaeB`\x82";
try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "red.pic", .data = png });
- try std.testing.expect(try s.refused("/ctl", "Plumb suffix .pic to nokind\n") != 0);
- try std.testing.expect(has(s.said, "Plumb: invalid port: url, dir, file or a loaded kind"));
- try s.write("/ctl", "Plumb suffix .pic to image\n");
+ // A port no kind reads is no refusal (plumber(4) never refuses one):
+ // nothing reads it, the rule set starts nothing, and Look looks itself.
+ const rule = "type is text\ndata matches '.*\\.pic'\narg isfile $data\nplumb to {s}\n\ninclude basic\n";
+ try s.replace("/plumb/rules", s.at(rule, .{"nokind"}));
+ try s.write("/look", s.at("{s}/red.pic\n", .{dir}));
+ try std.testing.expect(has(try s.read(s.at("/pane/{d}/tag", .{try s.focused()})), "red.pic"));
+ try s.write(s.at("/pane/{d}/ctl", .{try s.focused()}), "Del\n");
+ try s.replace("/plumb/rules", s.at(rule, .{"image"}));
try s.write("/look", s.at("{s}/red.pic\n", .{dir}));
try std.testing.expectEqual(try paneOf(&s, "image"), try s.focused());
try s.write(s.at("/pane/{d}/ctl", .{try s.focused()}), "Del\n");
diff --git a/test/behaviour/plumber.zig b/test/behaviour/plumber.zig
index f87c0449..28451222 100644
--- a/test/behaviour/plumber.zig
+++ b/test/behaviour/plumber.zig
@@ -14,7 +14,7 @@ test "plumber: plumb/rules reads the rules in force, a write adds rule sets, > r
try std.testing.expect(has(try s.read("/plumb/rules"), "type\tis\ttext\ndata\tmatches\t'https?://.*'\nplumb\tto\tweb\n\n"));
// Added, the last rule set at the close.
try s.write("/plumb/rules", "type is text\ndata matches 'gopher://.*'\nplumb to web\n");
- try std.testing.expect(std.mem.endsWith(u8, try s.read("/plumb/rules"), "plumb\tto\tedit\n\ntype\tis\ttext\ndata\tmatches\t'gopher://.*'\nplumb\tto\tweb\n\n"));
+ try std.testing.expect(std.mem.endsWith(u8, try s.read("/plumb/rules"), "plumb\tstart\tDiff $0\n\ntype\tis\ttext\ndata\tmatches\t'gopher://.*'\nplumb\tto\tweb\n\n"));
// A rule set refused at the write it is whole in, said with its line;
// the rules stay as they were.
const before = try s.read("/plumb/rules");