Mirrors
/
flycheck.el
mirror of https://github.com/flycheck/flycheck.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update flycheck-buttercup matchers to latest buttercup API 

Buttercup has updated the `expect` macro to wrap its arguments in closures [1],
so we now have to `funcall` the arguments passed to `buttercup-define-matcher`
in order to obtain their actual value.

In addition, default matchers like `:to-be-truthy` or `:to-equal` modify
`match-data`, so we have to save the results of a regexp search ourselves.

[1]: 929a904deb
pull/1320/head
fmdkdd 2017-09-04 11:05:49 +02:00 committed by fmdkdd
parent 8460e113e7
commit ff3fbaef0b
No known key found for this signature in database
GPG Key ID: B79CBB91DF5CB946
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flycheck-buttercup.el
View File

@ -55,12 +55,17 @@
;;; Data matchers
(buttercup-define-matcher :to-be-empty-string (s)
(if (equal s "")
(cons t (format "Expected %S not be an empty string" s))
(cons nil (format "Expected %S to be an empty string" s))))
(let ((s (funcall s)))
(if (equal s "")
(cons t (format "Expected %S not be an empty string" s))
(cons nil (format "Expected %S to be an empty string" s)))))
(buttercup-define-matcher :to-match-with-group (re s index match)
(let* ((matches? (string-match re s))
(let* ((re (funcall re))
(s (funcall s))
(index (funcall index))
(match (funcall match))
(matches? (string-match re s))
(result (and matches? (match-string index s))))
(if (and matches? (equal result match))
(cons t (format "Expected %S not to match %S with %S in group %s"
@ -76,7 +81,7 @@
;;; Emacs feature matchers
(buttercup-define-matcher :to-be-live (buffer)
(let ((buffer (get-buffer buffer)))
(let ((buffer (get-buffer (funcall buffer))))
(if (buffer-live-p buffer)
(cons t (format "Expected %S not to be a live buffer, but it is"
buffer))
@ -84,7 +89,7 @@
buffer)))))
(buttercup-define-matcher :to-be-visible (buffer)
(let ((buffer (get-buffer buffer)))
(let ((buffer (get-buffer (funcall buffer))))
(cond
((and buffer (get-buffer-window buffer))
(cons t (format "Expected %S not to be a visible buffer, but it is"
@ -99,31 +104,36 @@
buffer))))))
(buttercup-define-matcher :to-be-local (symbol)
(if (local-variable-p symbol)
(cons t (format "Expected %S not to be a local variable, but it is"
symbol))
(cons nil (format "Expected %S to be a local variable, but it is not"
symbol))))
(let ((symbol (funcall symbol)))
(if (local-variable-p symbol)
(cons t (format "Expected %S not to be a local variable, but it is"
symbol))
(cons nil (format "Expected %S to be a local variable, but it is not"
symbol)))))
(buttercup-define-matcher :to-contain-match (buffer re)
(if (not (get-buffer buffer))
(cons nil (format "Expected %S to contain a match of %s, \
(let ((buffer (funcall buffer))
(re (funcall re)))
(if (not (get-buffer buffer))
(cons nil (format "Expected %S to contain a match of %s, \
but is not a buffer" buffer re))
(with-current-buffer buffer
(save-excursion
(goto-char (point-min))
(if (re-search-forward re nil 'noerror)
(cons t (format "Expected %S to contain a match \
(with-current-buffer buffer
(save-excursion
(goto-char (point-min))
(if (re-search-forward re nil 'noerror)
(cons t (format "Expected %S to contain a match \
for %s, but it did not" buffer re))
(cons nil (format "Expected %S not to contain a match for \
%s but it did not." buffer re)))))))
(cons nil (format "Expected %S not to contain a match for \
%s but it did not." buffer re))))))))
;;; Flycheck matchers
(buttercup-define-matcher :to-be-equal-flycheck-errors (a b)
(let ((a-formatted (flycheck-buttercup-format-error-list a))
(b-formatted (flycheck-buttercup-format-error-list b)))
(let* ((a (funcall a))
(b (funcall b))
(a-formatted (flycheck-buttercup-format-error-list a))
(b-formatted (flycheck-buttercup-format-error-list b)))
(if (equal a b)
(cons t (format "Expected
%s

13
test/specs/languages/test-help.el
View File

@ -1,5 +1,6 @@
;;; test-help.el --- Flycheck Specs: Syntax checker help -*- lexical-binding: t; -*-
;; Copyright (C) 2017 Flycheck contributors
;; Copyright (C) 2016 Sebastian Wiesner
;; Author: Sebastian Wiesner <swiesner@lunaryorn.com>
@ -62,16 +63,20 @@
(unwind-protect
(progn
(expect (buffer-name) :to-equal "flycheck.el")
(expect (looking-at (rx bol
;; Default matchers modify `match-data', so we save search and
;; save the results first.
(let* ((in-checker-definition
(looking-at (rx bol
"(flycheck-define-checker"
symbol-end
" "
symbol-start
(group (1+ (or (syntax word)
(syntax symbol))))
symbol-end))
:to-be-truthy)
(expect (match-string 1) :to-equal (symbol-name checker)))
symbol-end)))
(checker-name (and in-checker-definition (match-string 1))))
(expect in-checker-definition :to-be-truthy)
(expect checker-name :to-equal (symbol-name checker))))
;; Kill the Flycheck buffer again
(kill-buffer))))