Merge 0.10->trunk

[prosody.git] / .luacheckrc

diff --git a/.luacheckrc b/.luacheckrc
index bcce11552a84e912d3e8a75c6a75dada9d406195..90d2e27398107aaf630f5c607ba262a815f8ebc2 100644 (file)
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,5 +1,5 @@
 cache = true
-read_globals = { "prosody", "hosts" }
+read_globals = { "prosody", "hosts", "import" }
 globals = { "_M" }
 allow_defined_top = true
 module = true
@@ -8,5 +8,18 @@ codes = true
 ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV" }
 
 files["plugins/"] = {
-       ignore = { "122/module" };
+       globals = { "module" };
+}
+files["tests/"] = {
+       read_globals = {
+               "testlib_new_env",
+               "assert_equal",
+               "assert_table",
+               "assert_function",
+               "assert_string",
+               "assert_boolean",
+               "assert_is",
+               "assert_is_not",
+               "runtest",
+       };
 }