From b8625e34cc561fbfc4aecc2e301a50b727d22e52 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Sat, 23 Sep 2023 15:30:16 +0930 Subject: [PATCH] Start fixing neotest phpunit for docker --- .config/nvim/lua/config/neotest.lua | 10 ++++-- .config/nvim/lua/packer-plugins.lua | 51 ++++++++++++++++------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/.config/nvim/lua/config/neotest.lua b/.config/nvim/lua/config/neotest.lua index 82b01db..5baa9d5 100644 --- a/.config/nvim/lua/config/neotest.lua +++ b/.config/nvim/lua/config/neotest.lua @@ -1,12 +1,16 @@ require("neotest").setup({ adapters = { - require("neotest-phpunit"), + require("neotest-phpunit")({ + root_files = { "phpunit.xml", "composer.json" }, + phpunit_cmd = { "docker-compose exec fpm ./vendor/bin/phpunit" }, + filter_dirs = { "vendor" } + }), }, }) require("neotest-phpunit")({ root_files = { "phpunit.xml", "composer.json" }, - -- phpunit_cmd = { "docker-compose exec fpm ./vendor/bin/phpunit" }, - phpunit_cmd = { "vendor/bin/phpunit" }, + phpunit_cmd = { "docker-compose", "exec", "fpm", "./vendor/bin/phpunit" }, + -- phpunit_cmd = { "vendor/bin/phpunit" }, filter_dirs = { "vendor" } }) diff --git a/.config/nvim/lua/packer-plugins.lua b/.config/nvim/lua/packer-plugins.lua index 2e8a42c..b644343 100644 --- a/.config/nvim/lua/packer-plugins.lua +++ b/.config/nvim/lua/packer-plugins.lua @@ -110,13 +110,18 @@ return require('packer').startup(function() end } + -- use { + -- 'glepnir/dashboard-nvim', + -- event = 'VimEnter', + -- config = function() + -- require('config.dashboard') + -- end, + -- requires = {'nvim-tree/nvim-web-devicons'} + -- } + use { - 'glepnir/dashboard-nvim', - event = 'VimEnter', - config = function() - require('config.dashboard') - end, - requires = {'nvim-tree/nvim-web-devicons'} + "eoh-bse/minintro.nvim", + config = function() require("minintro").setup() end } use { @@ -126,7 +131,7 @@ return require('packer').startup(function() 'nvim-treesitter/nvim-treesitter', 'antoinemadec/FixCursorHold.nvim', -- Adapters - 'olimorris/neotest-phpunit', + 'tovijaeschke/neotest-phpunit', 'nvim-neotest/neotest-go', }, config = function() @@ -158,16 +163,16 @@ return require('packer').startup(function() } -- CMD and search at the top - use { - 'folke/noice.nvim', - requires = { - 'MunifTanjim/nui.nvim', - 'rcarriga/nvim-notify', - }, - config = function () - require('config.noice') - end - } + -- use { + -- 'folke/noice.nvim', + -- requires = { + -- 'MunifTanjim/nui.nvim', + -- 'rcarriga/nvim-notify', + -- }, + -- config = function () + -- require('config.noice') + -- end + -- } -- DB manager use { @@ -198,12 +203,12 @@ return require('packer').startup(function() -- Programming language specifics use { 'dart-lang/dart-vim-plugin' } use { 'ray-x/guihua.lua' } - use { - 'ray-x/go.nvim', - config = function() - require('config.go') - end - } + -- use { + -- 'ray-x/go.nvim', + -- config = function() + -- require('config.go') + -- end + -- } -- Colorschemes use {