From 00f32f0430f82c74919c72af84bc95bf5ae434e4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 15 Aug 2024 22:36:02 -0500 Subject: [PATCH] tests/lua-loader: builtins.match -> lib.hasInfix Getting invalid regex expression on darwin. --- tests/test-sources/modules/lua-loader.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test-sources/modules/lua-loader.nix b/tests/test-sources/modules/lua-loader.nix index ed38fe35..0aaa450c 100644 --- a/tests/test-sources/modules/lua-loader.nix +++ b/tests/test-sources/modules/lua-loader.nix @@ -1,25 +1,25 @@ { # Test that nothing is configured by default default.module = - { config, ... }: + { config, lib, ... }: { files."files_test.lua" = { }; assertions = [ { - assertion = builtins.match ".*vim\.loader.*" config.content == null; + assertion = !lib.hasInfix "vim.loader" config.content; message = "No luaLoader configuration is expected in init.lua by default."; } { - assertion = builtins.match ".*vim\.loader.*" config.files."files_test.lua".content == null; + assertion = !lib.hasInfix "vim.loader" config.files."files_test.lua".content; message = "No luaLoader configuration is expected in 'files' submodules."; } ]; }; - # Test lua loader enabled + # Test Lua loader enabled enabled.module = - { config, ... }: + { config, lib, ... }: { luaLoader.enable = true; @@ -27,19 +27,19 @@ assertions = [ { - assertion = builtins.match ".*vim\.loader\.enable\(\).*" config.content != null; + assertion = lib.hasInfix "vim.loader.enable()" config.content; message = "luaLoader is expected to be explicitly enabled."; } { - assertion = builtins.match ".*vim\.loader.*" config.files."files_test.lua".content == null; + assertion = !lib.hasInfix "vim.loader" config.files."files_test.lua".content; message = "No luaLoader configuration is expected in 'files' submodules."; } ]; }; - # Test lua loader disabled + # Test Lua loader disabled disabled.module = - { config, ... }: + { config, lib, ... }: { luaLoader.enable = false; @@ -47,11 +47,11 @@ assertions = [ { - assertion = builtins.match ".*vim\.loader\.disable\(\).*" config.content != null; + assertion = lib.hasInfix "vim.loader.disable()" config.content; message = "luaLoader is expected to be explicitly disabled."; } { - assertion = builtins.match ".*vim\.loader.*" config.files."files_test.lua".content == null; + assertion = !lib.hasInfix "vim.loader." config.files."files_test.lua".content; message = "No luaLoader configuration is expected in 'files' submodules."; } ];