ERT window should occupy the whole frame

diff --git a/Makefile b/Makefile
index 6da51171aa35fcf034a9cd486dac8dc02c840e4b..ff1dc3e6fafe293a80ccd1079e66ff8afc6e95da 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,8 @@ clean:
        @rm -rf company-*/ company-*.tar company-*.tar.bz2
 
 test:
-       ${EMACS} -Q -nw -L . -l company-tests.el --eval "(ert t)"
+       ${EMACS} -Q -nw -L . -l company-tests.el \
+       --eval "(let (pop-up-windows) (ert t))"
 
 test-batch:
        ${EMACS} -Q --batch -L . -l company-tests.el \

diff --git a/company-tests.el b/company-tests.el
index 74789189f6655ab4a947e572a8d772896635a9b8..9b8e914b26b2effbdc731b73b3598f0c1ebc51b3 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -182,14 +182,13 @@
     (insert "aaaa\n bb\nccccc\nddd")
     (search-backward "bb")
     (let ((col-row (company--col-row))
-          (company-tooltip-limit 5)
           (company-candidates-length 2)
           (company-candidates '("123" "45")))
       (company-pseudo-tooltip-show (cdr col-row) (car col-row) 0)
       (let ((ov company-pseudo-tooltip-overlay))
         (should (eq (overlay-get ov 'company-width) 3))
         ;; FIXME: Make it 2?
-        (should (eq (overlay-get ov 'company-height) 5))
+        (should (eq (overlay-get ov 'company-height) 10))
         (should (eq (overlay-get ov 'company-column) (car col-row)))
         (should (string= (overlay-get ov 'company-before)
                          " 123\nc45 c\nddd\n"))))))