Fix the template tests

diff --git a/company-tests.el b/company-tests.el
index d4ab0b733bd37cb58bb98ceae6eb3c5229ed6c02..5aa4fd8bb0ea7f76b921dda9f8b6f49a5ce66d8c 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -175,14 +175,13 @@
 
 (ert-deftest company-template-removed-after-the-last-jump ()
   (with-temp-buffer
-    (insert "{ }")
+    (insert "{ foo foo }")
     (goto-char 2)
     (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
       (save-excursion
         (dotimes (i 2)
-          (insert " ")
-          (company-template-add-field tpl (point) "foo")
-          (forward-char 3)))
+          (search-forward "foo")
+          (company-template-add-field tpl (match-beginning 0) (match-end 0))))
       (company-call 'template-forward-field)
       (should (= 3 (point)))
       (company-call 'template-forward-field)
@@ -194,12 +193,10 @@
 
 (ert-deftest company-template-removed-after-input-and-jump ()
   (with-temp-buffer
-    (insert "{ }")
+    (insert "{ bar }")
     (goto-char 2)
     (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
-      (save-excursion
-        (insert " ")
-        (company-template-add-field tpl (point) "bar"))
+      (company-template-add-field tpl 3 6)
       (company-call 'template-move-to-first tpl)
       (should (= 3 (point)))
       (dolist (c (string-to-list "tee"))