Skip to content

Commit

Permalink
Replace Prove by Rove.
Browse files Browse the repository at this point in the history
  • Loading branch information
fukamachi committed Sep 9, 2019
1 parent 6eb88db commit 6bbb6a7
Show file tree
Hide file tree
Showing 12 changed files with 349 additions and 385 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ install:
curl -L http://nginx.org/download/nginx-1.8.0.tar.gz | tar xzf -;
(cd nginx-1.8.0 && ./configure --prefix=$HOME/nginx && make && make install);
fi
- ros install prove
- ros install fukamachi/circular-streams
- ros install rove
- ros install fukamachi/dexador

cache:
Expand All @@ -61,7 +60,7 @@ before_script:

script:
- if [ "$LISP" = "sbcl-bin" ]; then
run-prove t-*.asd;
rove t-*.asd;
else
run-prove t-clack-handler-hunchentoot.asd;
rove t-clack-handler-hunchentoot.asd;
fi
2 changes: 1 addition & 1 deletion clack-test.asd
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
:license "LLGPL"
:depends-on (:clack
:clack-handler-hunchentoot
:prove
:rove
:bordeaux-threads
:usocket
:dexador
Expand Down
14 changes: 5 additions & 9 deletions src/test.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
:stop)
(:import-from :dexador
:*use-connection-pool*)
(:import-from :prove
:subtest)
(:import-from :rove
:testing)
(:import-from :usocket
:socket-listen
:socket-close
Expand All @@ -20,8 +20,7 @@
:*enable-debug*
:*random-port*
:localhost
:testing-app
:subtest-app))
:testing-app))
(in-package :clack.test)

(defvar *clack-test-handler* :hunchentoot
Expand Down Expand Up @@ -118,8 +117,5 @@ Use if you want to set another port. The default is `*clack-test-port*`.")
(loop while (server-running-p *clack-test-port*)
do (sleep 0.1))))))

(defmacro testing-app (app &body body)
`(%testing-app ,app (lambda () ,@body)))

(defmacro subtest-app (desc app &body body)
`(testing-app ,app (subtest ,desc ,@body)))
(defmacro testing-app (desc app &body body)
`(%testing-app ,app (lambda () (testing ,desc ,@body))))

0 comments on commit 6bbb6a7

Please sign in to comment.