Commit 7f83144e authored by Sean Whitton's avatar Sean Whitton

Merge tag 'v1.12'

parents 8efadcaf 39d625ce
[bumpversion]
current_version = 1.11
current_version = 1.12
parse = (?P<major>\d+)\.(?P<minor>.*)
serialize = {major}.{minor}
files = buttercup.el buttercup-pkg.el
......
# Buttercup — Behavior-Driven Emacs Lisp Testing
[![Build Status](https://api.travis-ci.org/jorgenschaefer/emacs-buttercup.png?branch=master)](https://travis-ci.org/jorgenschaefer/emacs-buttercup)
[![Build Status](https://api.travis-ci.org/jorgenschaefer/emacs-buttercup.svg?branch=master)](https://travis-ci.org/jorgenschaefer/emacs-buttercup)
[![MELPA Stable](http://stable.melpa.org/packages/buttercup-badge.svg)](http://stable.melpa.org/#/buttercup)
![Ranculus repens, photo by sannse](docs/images/buttercup.jpg)
......
(define-package "buttercup" "1.11"
(define-package "buttercup" "1.12"
"Behavior-Driven Emacs Lisp Testing")
......@@ -2,7 +2,7 @@
;; Copyright (C) 2015-2017 Jorgen Schaefer <contact@jorgenschaefer.de>
;; Version: 1.11
;; Version: 1.12
;; Author: Jorgen Schaefer <contact@jorgenschaefer.de>
;; Package-Requires: ((emacs "24.3"))
;; URL: https://github.com/jorgenschaefer/emacs-buttercup
......@@ -452,7 +452,7 @@ See also `buttercup-define-matcher'."
spec)))
(a-uniques
(cons nil (buttercup-format-spec
"Expected `%A' to contain the e items as `%b', but `%p' are present unexprctedly."
"Expected `%A' to contain the same items as `%b', but `%p' are present unexpectedly."
spec)))
(b-uniques
(cons nil (buttercup-format-spec
......@@ -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.11")
(define-obsolete-function-alias 'buttercup-spec-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.11")
(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")
(defun buttercup-suites-total-specs-defined (suite-list)
"Return the number of specs defined in all suites in SUITE-LIST."
......
#!/bin/bash
set -e
cd "$(dirname "$0")/.."
main() {
run bumpversion minor
run git push
run git push --tags
}
run() {
echo "\$ $*"
"$@"
}
main
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment