Remove with-simulated-input

Eask

@@ -15,5 +15,4 @@
 (depends-on "counsel")
 
 (development
- (depends-on "with-simulated-input")
  (depends-on "buttercup"))

tests/test-counsel-projectile.el

@@ -1,11 +1,11 @@
 ;;; test-counsel-projectile.el --- Buttercup tests for counsel-projectile  -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
-(require 'with-simulated-input)
 (require 'counsel-projectile)
+(require 'buttercup)
 
 ;; Example test!
-(describe "counsel-projectile-switch-project with a mock"
+(describe "counsel-projectile-switch-project"
   (before-each
     (spy-on 'ivy-read)
     (spy-on 'projectile-project-root :and-return-value "/usr/fake-project")
@@ -13,43 +13,55 @@
       projectile-known-projects '("/usr/fake-project" "~/some-project")
       counsel-projectile-switch-project-action 'counsel-projectile-switch-project-action))
 
-  (it "spies on ivy-read arguments"
+  (it "calls ivy-read"
     (counsel-projectile-switch-project)
     (expect 'projectile-project-root :to-have-been-called)
-
+    (expect
-    (expect 'ivy-read :to-have-been-called-with
+      'ivy-read
+      :to-have-been-called-with
       "[fake-project] Switch to project: "
       '("/usr/fake-project" "~/some-project")
       :preselect "/usr/fake-project"
-      :action counsel-projectile-switch-project-action
+      :action 'counsel-projectile-switch-project-action
       :require-match t
       :sort nil
       :caller 'counsel-projectile-switch-project)))
 
-(describe "counsel-projectile-switch-project with the real ivy-read"
+(describe "counsel-projectile-rg"
   (before-each
-    (spy-on 'projectile-project-root :and-return-value "/usr/fake-project")
+    (spy-on 'ivy-read)
-    (setq
+    (spy-on 'projectile-project-root :and-return-value "/usr/fake-project"))
-      counsel-projectile-switch-project-action 'counsel-projectile-switch-project-action))
 
-  (it "signals error when project is unknown"
+  (it "calls ivy-read"
+    (counsel-projectile-rg)
     (expect
-      (with-simulated-input "/usr/fake RET"
+      'ivy-read
-        (condition-case err
+      :to-have-been-called-with
-          (counsel-projectile-switch-project)
+      "[fake-project] rg: "
-          (file-missing
+      'counsel-ag-function
-            (error-message-string err))))
+      :initial-input nil
-      :to-equal "Setting current directory: No such file or directory, /usr/fake-project")))
+      :dynamic-collection t
+      :keymap '(keymap
+                 (24 keymap (4 . counsel-cd))
+                 (67108903 . swiper-avy)
+                 (27 keymap (113 . counsel-git-grep-query-replace))
+                 (12 . ivy-call-and-recenter))
+      :history 'counsel-git-grep-history
+      :action 'counsel-git-grep-action
+      :require-match t
+      :caller 'counsel-rg)))
 
 (describe "counsel-projectile-find-file"
   (before-each
     (spy-on 'ivy-read)
     (spy-on 'projectile-project-root :and-return-value user-emacs-directory))
 
-  (it "finds a file"
+  (it "calls ivy-read"
     (counsel-projectile-find-file)
-    (expect 'ivy-read :to-have-been-called-with
+    (expect
-      "[29.1] Find file: " nil
+      'ivy-read
+      :to-have-been-called-with "[29.1] Find file: "
+      nil
       :matcher 'counsel-projectile--find-file-matcher
       :require-match t
       :sort nil