diff -Nru cider-0.19.0+dfsg/debian/changelog cider-0.19.0+dfsg/debian/changelog --- cider-0.19.0+dfsg/debian/changelog 2019-03-19 16:49:20.000000000 +0100 +++ cider-0.19.0+dfsg/debian/changelog 2020-07-06 12:30:35.000000000 +0200 @@ -1,3 +1,18 @@ +cider (0.19.0+dfsg-2ubuntu1) groovy; urgency=medium + + * Cherry pick upstream commit 50228d441efee8b5de92a0f34039ea6380352d92 + to fix "Spies can only be created in ‘before-each’" (Closes: #954699) + + * Cherry pick upstream commit adeede55ebc8db26131a9f04bf596621574d742c + - refreshed for current version + - via upstream PR#2804 (together with commit 50228d) + - https://github.com/clojure-emacs/cider/pull/2804 + + * Cherry pick one hunk of 92d2c3ed0416d8010bb74252b535fff80bbcbfd5 + - only before-all > before-each is needed to fix the tests + + -- Lukas Märdian Mon, 06 Jul 2020 12:30:35 +0200 + cider (0.19.0+dfsg-2) unstable; urgency=medium * Cherry pick upstream commit a48af155d8acf64e7c3025146027ef2d62f1cc2e diff -Nru cider-0.19.0+dfsg/debian/control cider-0.19.0+dfsg/debian/control --- cider-0.19.0+dfsg/debian/control 2019-03-19 16:49:20.000000000 +0100 +++ cider-0.19.0+dfsg/debian/control 2020-07-06 12:30:35.000000000 +0200 @@ -1,7 +1,8 @@ Source: cider Section: lisp Priority: optional -Maintainer: Debian Emacs addons team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Emacs addons team Uploaders: Sean Whitton , Build-Depends: diff -Nru cider-0.19.0+dfsg/debian/patches/0001-Wrap-spy-on-in-before-each.patch cider-0.19.0+dfsg/debian/patches/0001-Wrap-spy-on-in-before-each.patch --- cider-0.19.0+dfsg/debian/patches/0001-Wrap-spy-on-in-before-each.patch 1970-01-01 01:00:00.000000000 +0100 +++ cider-0.19.0+dfsg/debian/patches/0001-Wrap-spy-on-in-before-each.patch 2020-07-06 12:30:35.000000000 +0200 @@ -0,0 +1,32 @@ +From 50228d441efee8b5de92a0f34039ea6380352d92 Mon Sep 17 00:00:00 2001 +From: dan sutton +Date: Sat, 22 Feb 2020 00:26:14 -0600 +Subject: [PATCH] Wrap `spy-on` in before-each + +new buttercup version requires spy-on to be nested inside an `it` +macro or a `before-each` macro. +--- + test/cider-connection-tests.el | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/test/cider-connection-tests.el b/test/cider-connection-tests.el +index 1aa7524d..f1085705 100644 +--- a/test/cider-connection-tests.el ++++ b/test/cider-connection-tests.el +@@ -288,9 +288,10 @@ + (sesman-unregister 'CIDER session))))))) + + (describe "cider--connection-info" +- (spy-on 'cider--java-version :and-return-value "1.7") +- (spy-on 'cider--clojure-version :and-return-value "1.7.0") +- (spy-on 'cider--nrepl-version :and-return-value "0.2.1") ++ (before-each ++ (spy-on 'cider--java-version :and-return-value "1.7") ++ (spy-on 'cider--clojure-version :and-return-value "1.7.0") ++ (spy-on 'cider--nrepl-version :and-return-value "0.2.1")) + + (describe "when current project is known" + (it "returns information about the given connection buffer" +-- +2.25.1 + diff -Nru cider-0.19.0+dfsg/debian/patches/0002-Before-each-rather-than-before-all.patch cider-0.19.0+dfsg/debian/patches/0002-Before-each-rather-than-before-all.patch --- cider-0.19.0+dfsg/debian/patches/0002-Before-each-rather-than-before-all.patch 1970-01-01 01:00:00.000000000 +0100 +++ cider-0.19.0+dfsg/debian/patches/0002-Before-each-rather-than-before-all.patch 2020-07-06 12:30:35.000000000 +0200 @@ -0,0 +1,89 @@ +From adeede55ebc8db26131a9f04bf596621574d742c Mon Sep 17 00:00:00 2001 +From: dan sutton +Date: Sat, 22 Feb 2020 00:40:13 -0600 +Subject: [PATCH] Before-each rather than before-all + +--- + test/cider-eldoc-tests.el | 10 +++++----- + test/cider-repl-tests.el | 2 +- + test/cider-tests.el | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/test/cider-eldoc-tests.el b/test/cider-eldoc-tests.el +index d276e1c7..30a4097a 100644 +--- a/test/cider-eldoc-tests.el ++++ b/test/cider-eldoc-tests.el +@@ -39,7 +39,7 @@ + + (describe "cider--eldoc-format-class-names" + :var (class-names) +- (before-all ++ (before-each + (setq class-names '("java.lang.String" "java.lang.StringBuffer" "java.lang.CharSequence" "java.lang.StringBuilder"))) + + (it "returns a formatted class names prefix string" +@@ -71,7 +71,7 @@ + + (describe "cider-eldoc-format-thing" + :var (class-names) +- (before-all ++ (before-each + (setq class-names '("java.lang.String" "java.lang.StringBuffer" "java.lang.CharSequence" "java.lang.StringBuilder"))) + + (describe "when ns is given and it exists" +@@ -159,7 +159,7 @@ + :to-equal "map"))) + + (describe "cider-eldoc-info-in-current-sexp" +- (before-all ++ (before-each + (spy-on 'cider-connected-p :and-return-value t) + (spy-on 'cider-eldoc-info :and-call-fake + (lambda (thing) +@@ -209,7 +209,7 @@ + '("eldoc-info" ("clojure.core" "map" (("f") ("f" "coll"))) "thing" "map" "pos" 2))))) + + (describe "interop forms" +- (before-all ++ (before-each + (spy-on 'cider-connected-p :and-return-value t) + (spy-on 'cider-eldoc-info :and-call-fake + (lambda (thing) +@@ -237,7 +237,7 @@ + + (describe "cider-eldoc-format-sym-doc" + :var (eldoc-echo-area-use-multiline-p) +- (before-all ++ (before-each + (spy-on 'window-width :and-return-value 177)) + + (it "returns the formated eldoc string" +diff --git a/test/cider-repl-tests.el b/test/cider-repl-tests.el +index c3c56ebd..dd3c78ea 100644 +--- a/test/cider-repl-tests.el ++++ b/test/cider-repl-tests.el +@@ -35,7 +35,7 @@ + + (describe "cider-repl--banner" + :var (cider-version cider-codename) +- (before-all ++ (before-each + (spy-on 'cider--java-version :and-return-value "1.8.0_31") + (spy-on 'cider--clojure-version :and-return-value "1.8.0") + (spy-on 'cider--nrepl-version :and-return-value "0.2.12") +diff --git a/test/cider-tests.el b/test/cider-tests.el +index a25382a4..f2bc3e7d 100644 +--- a/test/cider-tests.el ++++ b/test/cider-tests.el +@@ -79,7 +79,7 @@ + (expect (cider-project-type) :to-equal 'lein))) + + (describe "when there are multiple possible project types" +- (before-all ++ (before-each + (spy-on 'cider--identify-buildtools-present + :and-return-value '(build-tool1 build-tool2)) + ;; user choice build-tool2 +-- +2.25.1 + diff -Nru cider-0.19.0+dfsg/debian/patches/0003-Fix-before-all.patch cider-0.19.0+dfsg/debian/patches/0003-Fix-before-all.patch --- cider-0.19.0+dfsg/debian/patches/0003-Fix-before-all.patch 1970-01-01 01:00:00.000000000 +0100 +++ cider-0.19.0+dfsg/debian/patches/0003-Fix-before-all.patch 2020-07-06 12:30:35.000000000 +0200 @@ -0,0 +1,26 @@ +From 9ed659bacc75e49e8d7a1d59375f4cb47c8ecf6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= +Date: Mon, 6 Jul 2020 12:29:02 +0200 +Subject: [PATCH] Fix before-all + +Compare upstream commit 92d2c3ed0416d8010bb74252b535fff80bbcbfd5 +--- + test/cider-client-tests.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/cider-client-tests.el b/test/cider-client-tests.el +index 702d87a9..299b1646 100644 +--- a/test/cider-client-tests.el ++++ b/test/cider-client-tests.el +@@ -109,7 +109,7 @@ + :to-throw 'user-error))) + + (describe "cider-expected-ns" +- (before-all ++ (before-each + (spy-on 'cider-connected-p :and-return-value t) + (spy-on 'cider-sync-request:classpath :and-return-value + '("/a" "/b" "/c" "/c/inner" "/base/clj" "/base/clj-dev"))) +-- +2.25.1 + diff -Nru cider-0.19.0+dfsg/debian/patches/series cider-0.19.0+dfsg/debian/patches/series --- cider-0.19.0+dfsg/debian/patches/series 2019-03-19 16:49:20.000000000 +0100 +++ cider-0.19.0+dfsg/debian/patches/series 2020-07-06 12:30:35.000000000 +0200 @@ -1 +1,4 @@ debian-changes +0001-Wrap-spy-on-in-before-each.patch +0002-Before-each-rather-than-before-all.patch +0003-Fix-before-all.patch