diff options
| author | Jorgen Schäfer <Jorgen.Schaefer@gmail.com> | 2018-08-31 09:45:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 09:45:09 +0200 |
| commit | d07dbf392c2ff09e664969b151d0f2f7b56119ed (patch) | |
| tree | 6e2291794f0fdf8380608f8cce495621d498ec03 | |
| parent | 39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a (diff) | |
| parent | 803459759d913c64d94b4438ac5a68b465b8cf98 (diff) | |
Merge pull request #129 from snogge/fix-obsolete-aliases
Fix obsolete aliases
| -rw-r--r-- | buttercup.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buttercup.el b/buttercup.el index c199f16..1ca3898 100644 --- a/buttercup.el +++ b/buttercup.el @@ -700,8 +700,8 @@ See also `buttercup-define-matcher'." (cons (buttercup-suite-or-spec-parent suite-or-spec) (buttercup-suite-or-spec-parents (buttercup-suite-or-spec-parent suite-or-spec))))) -(define-obsolete-function-alias 'buttercup-suite-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.12") -(define-obsolete-function-alias 'buttercup-spec-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.12") +(define-obsolete-function-alias 'buttercup-suite-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.10") +(define-obsolete-function-alias 'buttercup-spec-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.10") (defun buttercup-suites-total-specs-defined (suite-list) "Return the number of specs defined in all suites in SUITE-LIST." @@ -743,7 +743,7 @@ See also `buttercup-define-matcher'." (defun buttercup-suite-full-name (suite) "Return the full name of SUITE, which includes the names of the parents." (mapconcat #'buttercup-suite-description - (nreverse (cons suite (buttercup-suite-parents suite))) + (nreverse (cons suite (buttercup-suite-or-spec-parents suite))) " ")) (defun buttercup-spec-full-name (spec) @@ -1402,13 +1402,13 @@ EVENT and ARG are described in `buttercup-reporter'." (buttercup--print "Running %s specs.\n\n" defined)))) (`suite-started - (let ((level (length (buttercup-suite-parents arg)))) + (let ((level (length (buttercup-suite-or-spec-parents arg)))) (buttercup--print "%s%s\n" (make-string (* 2 level) ?\s) (buttercup-suite-description arg)))) (`spec-started - (let ((level (length (buttercup-spec-parents arg)))) + (let ((level (length (buttercup-suite-or-spec-parents arg)))) (buttercup--print "%s%s" (make-string (* 2 level) ?\s) (buttercup-spec-description arg)))) @@ -1428,7 +1428,7 @@ EVENT and ARG are described in `buttercup-reporter'." (error "Unknown spec status %s" (buttercup-spec-status arg))))) (`suite-done - (when (= 0 (length (buttercup-suite-parents arg))) + (when (= 0 (length (buttercup-suite-or-spec-parents arg))) (buttercup--print "\n"))) (`buttercup-done @@ -1483,7 +1483,7 @@ colors. EVENT and ARG are described in `buttercup-reporter'." (pcase event (`spec-done - (let ((level (length (buttercup-spec-parents arg)))) + (let ((level (length (buttercup-suite-or-spec-parents arg)))) (cond ((eq (buttercup-spec-status arg) 'passed) (buttercup--print (buttercup-colorize "\r%s%s\n" 'green) |