From f0ee11db0e16885e7944adafa40317c9932b8f53 Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Tue, 19 Feb 2019 18:03:09 -0600 Subject: [PATCH 1/4] Update FSAutoComplete to the latest release This should address quite a few defects that have been sitting in the (currently year old) release of FSAutocomplete. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5462a2d..c119811 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ load_integration_tests = $(patsubst %,-l %, $(integration_tests)) # Autocomplete binary distribution. ac_name = fsautocomplete ac_exe = $(bin_d)/$(ac_name).exe -ac_version = 0.34.0 +ac_version = 0.35.0 ac_archive = $(ac_name)-$(ac_version).zip ac_url = https://github.com/fsharp/FsAutoComplete/releases/download/$(ac_version)/$(ac_name).zip From 4790f0ecb562d55bec0a03fd0e643b39d9979359 Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Fri, 1 Mar 2019 17:53:36 -0600 Subject: [PATCH 2/4] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c119811..7c46405 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ load_integration_tests = $(patsubst %,-l %, $(integration_tests)) # Autocomplete binary distribution. ac_name = fsautocomplete ac_exe = $(bin_d)/$(ac_name).exe -ac_version = 0.35.0 +ac_version = 0.36.0 ac_archive = $(ac_name)-$(ac_version).zip ac_url = https://github.com/fsharp/FsAutoComplete/releases/download/$(ac_version)/$(ac_name).zip From c26389cc9b99994d8f45310110a71985813f50a7 Mon Sep 17 00:00:00 2001 From: Juergen Hoetzel Date: Mon, 4 Mar 2019 14:31:00 +0100 Subject: [PATCH 3/4] Add Makefile variable test-selector This enables the selection of ert tests to run. --- Makefile | 6 +++++- test/test-common.el | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7c46405..7c3f734 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,11 @@ test unit-test fake-home: $(emacs) $(load_files) --batch -f run-fsharp-unit-tests integration-test : $(ac_exe) packages fake-home - $(emacs) $(load_files) --batch -f run-fsharp-integration-tests +ifdef test-selector + $(emacs) $(load_files) --batch --eval "(let ((fsharp--test-selector \"$(test-selector)\"))(run-fsharp-integration-tests))" +else + $(emacs) $(load_files) --batch --eval "(run-fsharp-integration-tests)" +endif test-all : unit-test integration-test check-compile check-declares diff --git a/test/test-common.el b/test/test-common.el index d1dfdc7..232d8df 100644 --- a/test/test-common.el +++ b/test/test-common.el @@ -2,6 +2,10 @@ (require 'package) (require 'cl) + +(defvar fsharp--test-selector t + "SELECTOR used in ert tests.") + (defmacro check (desc &rest body) "Wrap ert-deftest with a simpler interface." (declare (indent 1)) @@ -99,8 +103,8 @@ glob emacs/test/*test.el." (let ((test-files (if files files fsharp-test-files))) (mapc 'load-file test-files) (if noninteractive - (ert-run-tests-batch-and-exit) - (ert-run-tests-interactively t)))) + (ert-run-tests-batch-and-exit fsharp--test-selector) + (ert-run-tests-interactively fsharp--test-selector)))) (defconst fsharp-test-files (directory-files From d104548b95768fd70692b56908a6e02522895684 Mon Sep 17 00:00:00 2001 From: Juergen Hoetzel Date: Mon, 4 Mar 2019 14:31:00 +0100 Subject: [PATCH 4/4] Integration tests: Releax tooltip match Fix failing travis test resulting from improved fsautocomplete.exe tooltips. Fixes #193. --- test/integration-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration-tests.el b/test/integration-tests.el index 2db11f0..68aeb73 100644 --- a/test/integration-tests.el +++ b/test/integration-tests.el @@ -143,7 +143,7 @@ (fsharp-ac-parse-current-buffer t) (fsharp-ac/show-tooltip-at-point) (wait-for-condition tiptext) - (should-match "val func : x:int -> int\n\nFull name: Program.X.func" + (should-match "val func:[ \n]+x: int[ \n]+-> int" tiptext)))))) (ert-deftest check-errors ()