Mineunit rock (#93)

Co-authored-by: SX <sx@minetest>
S-S-X · Feb 23, 2021 · 680c880 · 680c880
1 parent 0ac454d
commit 680c880
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 26 deletions.
diff --git a/containertool/spec/mineunit.conf b/containertool/spec/mineunit.conf
@@ -0,0 +1,5 @@
+modname = "containertool"
+fixture_paths = {
+	"spec/fixtures",
+	"../metatool/spec/fixtures",
+}
diff --git a/containertool/spec/tool_spec.lua b/containertool/spec/tool_spec.lua
@@ -1,7 +1,7 @@
 --[[
 	Regression tests for container tool
 --]]
-dofile("../metatool/spec/mineunit/init.lua")
+require("mineunit")
 
 mineunit:set_modpath("containertool", ".")
 

diff --git a/metatool/spec/api_spec.lua b/metatool/spec/api_spec.lua
@@ -9,7 +9,7 @@
 		- No configuration, empty file
 		- No configuration, not even empty file
 --]]
-dofile("spec/mineunit/init.lua")
+require("mineunit")
 
 mineunit("core")
 mineunit("player")

diff --git a/metatool/spec/fixtures/metatool.lua b/metatool/spec/fixtures/metatool.lua
@@ -5,28 +5,6 @@ _G.metatool = {}
 _G.metatool.S = string.format
 _G.metatool.configuration_file = fixture_path("metatool.cfg")
 
-_G.Settings = function(fname)
-	local settings = {
-		_data = {},
-		set = function(...)end,
-		write = function(...)end,
-		to_table = function(self)
-			local result = {}
-			for k,v in pairs(self._data) do
-				result[k] = v
-			end
-			return result
-		end,
-	}
-	file = assert(io.open(fname, "r"))
-	for line in file:lines() do
-		for key, value in string.gmatch(line, "([^= ]+) *= *(.-)$") do
-			settings._data[key] = value
-		end
-	end
-	return settings
-end
-
 minetest.register_node(":testnode1", {})
 minetest.register_node(":testnode2", {})
 minetest.register_node(":testnode3", {})
diff --git a/metatool/spec/settings_spec.lua b/metatool/spec/settings_spec.lua
@@ -9,7 +9,7 @@
 		- No configuration, empty file
 		- No configuration, not even empty file
 --]]
-dofile("spec/mineunit/init.lua")
+require("mineunit")
 
 mineunit("core")
 

diff --git a/sharetool/spec/mineunit.conf b/sharetool/spec/mineunit.conf
@@ -0,0 +1,5 @@
+modname = "sharetool"
+fixture_paths = {
+	"spec/fixtures",
+	"../metatool/spec/fixtures",
+}
diff --git a/sharetool/spec/tool_spec.lua b/sharetool/spec/tool_spec.lua
@@ -1,7 +1,7 @@
 --[[
 	Regression tests for sharetool
 --]]
-dofile("../metatool/spec/mineunit/init.lua")
+require("mineunit")
 
 mineunit:set_modpath("sharetool", ".")