diff options
| author | Stefan Kangas <stefan@marxist.se> | 2020-10-24 03:45:48 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2020-10-24 13:35:49 +0200 |
| commit | 228d9d615d7067ca06a2b53205c29d78dbbfe725 (patch) | |
| tree | 0344d8c23374a8f481c9856e06497f130f0dce6c /test/lisp/faces-tests.el | |
| parent | 2c487c47c8c3060818b2fcbfebbcd859f9d06ef5 (diff) | |
| download | emacs-228d9d615d7067ca06a2b53205c29d78dbbfe725.tar.gz emacs-228d9d615d7067ca06a2b53205c29d78dbbfe725.tar.bz2 emacs-228d9d615d7067ca06a2b53205c29d78dbbfe725.zip | |
Move faces.el test data to follow our conventions
* test/lisp/faces-tests.el (ert-x): Require.
(faces--test-data-dir): Remove variable.
(faces--test-extend-with-themes): Use ert-resource-directory.
* test/lisp/faces-resources/*: Moved from test/data/themes/*.
Diffstat (limited to 'test/lisp/faces-tests.el')
| -rw-r--r-- | test/lisp/faces-tests.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el index 32dc1eea856..b19cef5decd 100644 --- a/test/lisp/faces-tests.el +++ b/test/lisp/faces-tests.el @@ -23,13 +23,9 @@ ;;; Code: (require 'ert) +(require 'ert-x) (require 'faces) -(defvar faces--test-data-dir - (expand-file-name "../data/" - (file-name-directory (or load-file-name - buffer-file-name)))) - (defgroup faces--test nil "" :group 'faces--test) @@ -122,7 +118,7 @@ (should (equal (face-attribute 'spiff-changed-face :extend) t)) (should (equal (face-attribute 'spiff-added :extend) 'unspecified)) (should (equal (face-attribute 'spiff-file-header-face :extend) nil)) - (add-to-list 'custom-theme-load-path (concat faces--test-data-dir "themes")) + (add-to-list 'custom-theme-load-path (ert-resource-directory)) (load-theme 'faces-test-dark t t) (load-theme 'faces-test-light t t) (should (equal (face-attribute 'faces--test-inherit-extend :extend) |