tests: Use require instead of load for module setup

8 files changed, 11 insertions, 60 deletions

diff --git a/tests/forgejo-test-api.el b/tests/forgejo-test-api.el
index 123a7ff..7891f53 100644
--- a/tests/forgejo-test-api.el
+++ b/tests/forgejo-test-api.el
@@ -9,11 +9,9 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-api.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo)
+(require 'forgejo-api)
 
 ;;; Group 1: URL building
 
diff --git a/tests/forgejo-test-buffer.el b/tests/forgejo-test-buffer.el
index ade907d..ed72c37 100644
--- a/tests/forgejo-test-buffer.el
+++ b/tests/forgejo-test-buffer.el
@@ -10,13 +10,8 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-api.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-buffer.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo-buffer)
 
 ;;; Group 1: State formatting
 
diff --git a/tests/forgejo-test-db.el b/tests/forgejo-test-db.el
index f65a245..8f69dd6 100644
--- a/tests/forgejo-test-db.el
+++ b/tests/forgejo-test-db.el
@@ -10,11 +10,9 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-db.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo)
+(require 'forgejo-db)
 
 (defvar forgejo-test-db--temp-dir nil)
 
diff --git a/tests/forgejo-test-filter.el b/tests/forgejo-test-filter.el
index a980ba9..5ce0b60 100644
--- a/tests/forgejo-test-filter.el
+++ b/tests/forgejo-test-filter.el
@@ -10,17 +10,9 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-tl.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-api.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-buffer.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-filter.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo-buffer)
+(require 'forgejo-filter)
 
 ;;; Group 1: Parse
 
diff --git a/tests/forgejo-test-host.el b/tests/forgejo-test-host.el
index 371c594..e26fb69 100644
--- a/tests/forgejo-test-host.el
+++ b/tests/forgejo-test-host.el
@@ -10,9 +10,8 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
+(require 'forgejo)
 
 ;;; Group 1: Host validation
 
diff --git a/tests/forgejo-test-issue.el b/tests/forgejo-test-issue.el
index 01528b1..e204e34 100644
--- a/tests/forgejo-test-issue.el
+++ b/tests/forgejo-test-issue.el
@@ -9,21 +9,8 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-tl.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-api.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-buffer.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-filter.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-view.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-issue.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo-issue)
 
 ;;; Group 1: Entry conversion
 
diff --git a/tests/forgejo-test-pull.el b/tests/forgejo-test-pull.el
index 2196a8d..2ca6c33 100644
--- a/tests/forgejo-test-pull.el
+++ b/tests/forgejo-test-pull.el
@@ -9,21 +9,8 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-tl.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-api.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-buffer.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-filter.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-view.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-pull.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo-pull)
 
 ;;; Group 1: PR entry formatting
 
diff --git a/tests/forgejo-test-vc.el b/tests/forgejo-test-vc.el
index 8fc92d7..0164703 100644
--- a/tests/forgejo-test-vc.el
+++ b/tests/forgejo-test-vc.el
@@ -10,13 +10,8 @@
 (require 'ert)
 (require 'cl-lib)
 
-(load (expand-file-name "../lisp/forgejo.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
 (setq forgejo-markdown-mode 'text-mode)
-(load (expand-file-name "../lisp/forgejo-utils.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
-(load (expand-file-name "../lisp/forgejo-vc.el"
-       (file-name-directory (or load-file-name buffer-file-name))))
+(require 'forgejo-vc)
 
 ;;; Group 1: Refspec building