Convert to luatest. (#33)

* Add luatest and remove busted. * Convert a test. * Add more tests. * Rename src to lua. * Add more tests. * Set a coverage configuration. * Add more tests. I need to figure out why tests with stubs are breaking. There's something going on with reseting. Busted probably avoided this problem by reloading the world. * Convert more tests. * Convert remaining tests. * Fix broken server tests. * Add coverage measurement.
mblayman · Jul 16, 2023 · 242310f · 242310f
1 parent 9d5b974
commit 242310f
Show file tree

Hide file tree

Showing 67 changed files with 1,317 additions and 1,207 deletions.
diff --git a/.envrc b/.envrc
@@ -1,7 +1,7 @@
 PATH_add .luarocks/bin
 PATH_add bin
 # This is not optimal, but assume 5.4 for now.
-export LUA_PATH='src/?.lua;src/?/init.lua;.luarocks/share/lua/5.4/?.lua;.luarocks/share/lua/5.4/?/init.lua;;'
+export LUA_PATH='lua/?.lua;lua/?/init.lua;.luarocks/share/lua/5.4/?.lua;.luarocks/share/lua/5.4/?/init.lua;;'
 export LUA_CPATH='.luarocks/lib/lua/5.4/?.so;;'
 
 dotenv
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,11 +28,9 @@ jobs:
       run: make build
 
     - name: style
-      run: "find src tests -name '*.lua' -print0 | xargs -0 lua-format --check"
+      run: "find lua tests -name '*.lua' -print0 | xargs -0 lua-format --check"
 
     - name: test
-      run: |
-        make coverage
-        cat luacov.report.out | grep Total | grep 100.00% > /dev/null
+      run: luatest --cov lua
       env:
         ATLAS_CONFIG: tests.config
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,6 @@ venv/
 
 # Environment
 .env
+
+lcov.info
+html
diff --git a/Makefile b/Makefile
@@ -2,24 +2,11 @@
 
 lr = luarocks --tree .luarocks
 
-coverage: clean t
-	luacov src
-	@tail -n+$$(cat luacov.report.out | grep -m 1 -n 'Summary' | cut -d: -f 1) luacov.report.out | grep -v '100.00'
-
 clean:
-	@rm -f luacov.*
-
-# Busted has no expected failure feature so let's fake it for now.
-# This isn't great because it hides tests instead of skipping them
-# and showing that they were skipped.
-t:
-	busted --exclude-tags xfail
-
-tap:
-	busted --exclude-tags xfail -o tap
+	@rm -rf lcov.info html
 
 build:
-	$(lr) install busted
+	$(lr) install luatest
 	$(lr) install LuaCov
 	which lua-format || $(lr) install --server https://luarocks.org/dev luaformatter
 	$(lr) make
@@ -29,3 +16,8 @@ atlas:
 
 bootstrap:
 	$(lr) install luacheck
+
+coverage: clean
+	luatest --cov lua
+	genhtml -o html lcov.info
+	open html/index.html
diff --git a/README.md b/README.md
@@ -53,8 +53,7 @@ This order sounds appealing to me.
 
 ## Tools
 
-* Busted for tests. `luarocks install busted`
-* LuaCov for coverage. `luarocks install LuaCov`
+* luatest for tests. `luarocks install luatest`
 * LuaCheck for lint. `luarocks install LuaCheck`
 * Here is the pre-commit PR for Lua support:
   https://github.com/pre-commit/pre-commit/pull/2158

diff --git a/_vimrc_local.vim b/_vimrc_local.vim
diff --git a/bin/t b/bin/t
@@ -1,2 +1,2 @@
 #!/bin/bash
-make t
+luatest $@
diff --git a/src/atlas/application.lua → lua/atlas/application.lua b/src/atlas/application.lua → lua/atlas/application.lua
diff --git a/src/atlas/config.lua → lua/atlas/config.lua b/src/atlas/config.lua → lua/atlas/config.lua
diff --git a/src/atlas/configuration.lua → lua/atlas/configuration.lua b/src/atlas/configuration.lua → lua/atlas/configuration.lua
diff --git a/src/atlas/default_config.lua → lua/atlas/default_config.lua b/src/atlas/default_config.lua → lua/atlas/default_config.lua
diff --git a/src/atlas/fs.lua → lua/atlas/fs.lua b/src/atlas/fs.lua → lua/atlas/fs.lua
diff --git a/src/atlas/logging.lua → lua/atlas/logging.lua b/src/atlas/logging.lua → lua/atlas/logging.lua
diff --git a/src/atlas/main.lua → lua/atlas/main.lua b/src/atlas/main.lua → lua/atlas/main.lua
diff --git a/src/atlas/match.lua → lua/atlas/match.lua b/src/atlas/match.lua → lua/atlas/match.lua
diff --git a/src/atlas/request.lua → lua/atlas/request.lua b/src/atlas/request.lua → lua/atlas/request.lua
diff --git a/src/atlas/response.lua → lua/atlas/response.lua b/src/atlas/response.lua → lua/atlas/response.lua
diff --git a/src/atlas/route.lua → lua/atlas/route.lua b/src/atlas/route.lua → lua/atlas/route.lua
diff --git a/src/atlas/router.lua → lua/atlas/router.lua b/src/atlas/router.lua → lua/atlas/router.lua
diff --git a/src/atlas/server/http_11_parser.lua → lua/atlas/server/http_11_parser.lua b/src/atlas/server/http_11_parser.lua → lua/atlas/server/http_11_parser.lua
diff --git a/src/atlas/server/main.lua → lua/atlas/server/main.lua b/src/atlas/server/main.lua → lua/atlas/server/main.lua
diff --git a/src/atlas/server/parser_errors.lua → lua/atlas/server/parser_errors.lua b/src/atlas/server/parser_errors.lua → lua/atlas/server/parser_errors.lua
diff --git a/src/atlas/server/server.lua → lua/atlas/server/server.lua b/src/atlas/server/server.lua → lua/atlas/server/server.lua
diff --git a/src/atlas/server/statuses.lua → lua/atlas/server/statuses.lua b/src/atlas/server/statuses.lua → lua/atlas/server/statuses.lua
diff --git a/src/atlas/templates.lua → lua/atlas/templates.lua b/src/atlas/templates.lua → lua/atlas/templates.lua
diff --git a/src/atlas/templates/code_builder.lua → lua/atlas/templates/code_builder.lua b/src/atlas/templates/code_builder.lua → lua/atlas/templates/code_builder.lua
diff --git a/src/atlas/templates/environment.lua → lua/atlas/templates/environment.lua b/src/atlas/templates/environment.lua → lua/atlas/templates/environment.lua
diff --git a/src/atlas/templates/file_loader.lua → lua/atlas/templates/file_loader.lua b/src/atlas/templates/file_loader.lua → lua/atlas/templates/file_loader.lua
diff --git a/src/atlas/templates/parser.lua → lua/atlas/templates/parser.lua b/src/atlas/templates/parser.lua → lua/atlas/templates/parser.lua
diff --git a/src/atlas/templates/state.lua → lua/atlas/templates/state.lua b/src/atlas/templates/state.lua → lua/atlas/templates/state.lua
diff --git a/src/atlas/templates/template.lua → lua/atlas/templates/template.lua b/src/atlas/templates/template.lua → lua/atlas/templates/template.lua
diff --git a/src/atlas/test/asgi.lua → lua/atlas/test/asgi.lua b/src/atlas/test/asgi.lua → lua/atlas/test/asgi.lua
diff --git a/src/atlas/test/assertions.lua → lua/atlas/test/assertions.lua b/src/atlas/test/assertions.lua → lua/atlas/test/assertions.lua
@@ -1,4 +1,4 @@
-local assert = require "luassert.assert"
+local assert = require "luassert"
 
 local assertions = {}
 

diff --git a/src/atlas/test/loop.lua → lua/atlas/test/loop.lua b/src/atlas/test/loop.lua → lua/atlas/test/loop.lua
@@ -1,4 +1,4 @@
-local assert = require "luassert.assert"
+local assert = require "luassert"
 local luv = require "luv"
 
 local loop = {}

diff --git a/src/atlas/utils.lua → lua/atlas/utils.lua b/src/atlas/utils.lua → lua/atlas/utils.lua
diff --git a/tests/application_test.lua b/tests/application_test.lua
diff --git a/tests/configuration_test.lua b/tests/configuration_test.lua
diff --git a/tests/fs_test.lua b/tests/fs_test.lua
diff --git a/tests/main_test.lua b/tests/main_test.lua
diff --git a/tests/request_test.lua b/tests/request_test.lua
diff --git a/tests/response_test.lua b/tests/response_test.lua