[nongnu] elpa/buttercup 49f01fc 219/340: Merge branch 'master' into test-emacs-26.3

[ELPA Syncer]

branch: elpa/buttercup
commit 49f01fc6d86dc539901e5986c766777716ea7187
Merge: 1567c03 246ddd7
Author: Ola Nilsson <ola.nilsson@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge branch 'master' into test-emacs-26.3
---
 .travis.yml           |  9 +++++----
 docs/writing-tests.md | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d663d0..74c768e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,16 @@
 language: emacs-lisp
-sudo: no
+dist: xenial
 env:
   - EVM_EMACS=emacs-24.3-travis
   - EVM_EMACS=emacs-24.4-travis
   - EVM_EMACS=emacs-24.5-travis
   - EVM_EMACS=emacs-25.1-travis
   - EVM_EMACS=emacs-25.2-travis
-  - EVM_EMACS=emacs-26.1-travis
-  - EVM_EMACS=emacs-26.2-travis
-  - EVM_EMACS=emacs-26.3-travis
+  - EVM_EMACS=emacs-26.1-travis-linux-xenial
+  - EVM_EMACS=emacs-26.2-travis-linux-xenial
+  - EVM_EMACS=emacs-26.3-travis-linux-xenial
 before_install:
+  - sudo apt-get install libgnutls30
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > 
travis.sh && source ./travis.sh
   - evm install "$EVM_EMACS" --use --skip
 script:
diff --git a/docs/writing-tests.md b/docs/writing-tests.md
index 7be3782..cb72b28 100644
--- a/docs/writing-tests.md
+++ b/docs/writing-tests.md
@@ -640,7 +640,8 @@ By default, Buttercup captures any warning emitted during a 
test and
 displays them all after the test completes in order to keep the output
 readable. If you need to suppress this (for example if your test deals
 with the warnings itself), you can use the macro
-`buttercup-suppress-warning-capture`.
+`buttercup-suppress-warning-capture`, which works like `progn` but
+suppresses Buttercup's warning capturing within the body.
 
 ```Emacs-Lisp
 (describe "A test"
@@ -650,8 +651,11 @@ with the warnings itself), you can use the macro
 
   (it "can capture its own warnings as part of the test"
     (buttercup-suppress-warning-capture
-      (display-warning 'buttercup "This warning should be captured in 
`collected-output'.")
-      (expect (with-current-buffer "*Warnings*"
-                (buffer-string))
-              :to-match "This warning should be captured"))))
+      (let ((warning-text
+             (format "This warning, issued at %s should be sent to the 
*Warnings* buffer as normal."
+                     (current-time-string))))
+        (display-warning 'buttercup warning-text)
+        (expect (with-current-buffer "*Warnings*"
+                  (buffer-string))
+                :to-match (regexp-quote warning-text))))))
 ```