chore(tests): Adjust spec handling so we can test against installed l…

…ibrary
lunarmodules · Dec 12, 2023 · e4213db · e4213db
1 parent e8b1829
commit e4213db
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/spec/cliargs_spec.lua b/spec/cliargs_spec.lua
@@ -1,4 +1,4 @@
-require 'spec_helper'
+dofile("spec/spec_helper.lua")
 local cliargs = require 'cliargs'
 
 describe('cliargs', function()
@@ -63,4 +63,4 @@ describe('cliargs', function()
       assert.is_nil(package.loaded['cliargs'])
     end)
   end)
-end)
+end)
diff --git a/spec/config_loader_spec.lua b/spec/config_loader_spec.lua
@@ -1,4 +1,4 @@
-require 'spec_helper'
+dofile("spec/spec_helper.lua")
 
 describe("cliargs.config_loader", function()
   local cli, args, err
@@ -49,4 +49,4 @@ describe("cliargs.config_loader", function()
       args, err = cli:parse({ '--config', 'spec/fixtures/config.lua' })
     end)
   end)
-end)
+end)
diff --git a/spec/core_spec.lua b/spec/core_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require "spec_helper"
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("cliargs::core", function()
   local cli
@@ -177,4 +177,4 @@ describe("cliargs::core", function()
       end)
     end)
   end)
-end)
+end)
diff --git a/spec/features/argument_spec.lua b/spec/features/argument_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require("spec_helper")
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("cliargs - arguments", function()
   local cli
@@ -117,4 +117,4 @@ describe("cliargs - arguments", function()
       end)
     end)
   end)
-end)
+end)
diff --git a/spec/features/flag_spec.lua b/spec/features/flag_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require("spec_helper")
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("cliargs - flags", function()
   local cli
@@ -196,4 +196,4 @@ describe("cliargs - flags", function()
       end)
     end)
   end)
-end)
+end)
diff --git a/spec/features/integration_spec.lua b/spec/features/integration_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require "spec_helper"
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("integration: parsing", function()
   local cli
@@ -149,4 +149,4 @@ describe("integration: parsing", function()
       })
     end)
   end)
-end)
+end)
diff --git a/spec/features/option_spec.lua b/spec/features/option_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require("spec_helper")
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("cliargs - options", function()
   local cli
@@ -245,4 +245,4 @@ describe("cliargs - options", function()
       end)
     end)
   end)
-end)
+end)
diff --git a/spec/features/splatarg_spec.lua b/spec/features/splatarg_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require("spec_helper")
+local helpers = dofile("spec/spec_helper.lua")
 
 describe("cliargs - splat arguments", function()
   local cli
@@ -115,4 +115,4 @@ describe("cliargs - splat arguments", function()
       assert.equal(call_args[2], 'b')
     end)
   end)
-end)
+end)
diff --git a/spec/printer_spec.lua b/spec/printer_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require 'spec_helper'
+local helpers = dofile("spec/spec_helper.lua")
 local trim = helpers.trim
 
 describe('printer', function()
@@ -270,4 +270,4 @@ describe('printer', function()
       cli.printer.dump_internal_state({})
     end)
   end)
-end)
+end)
diff --git a/spec/spec_helper.lua b/spec/spec_helper.lua
@@ -41,4 +41,4 @@ exports.trim = function(s)
   return buffer:gsub("%s+$", '')
 end
 
-return exports
+return exports
diff --git a/spec/utils/disect_argument_spec.lua b/spec/utils/disect_argument_spec.lua
@@ -1,7 +1,6 @@
+dofile("spec/spec_helper.lua")
 local disect_argument = require('cliargs.utils.disect_argument')
 
-require("spec_helper")
-
 describe("utils::disect_argument", function()
   local function assert_disect(pattern, expected)
     it("works with '" .. pattern .. "'", function()