Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
92c3eae
Update changelog
davidshepherd7 Dec 1, 2024
cd28c3b
Convert prog mode feature tests to ert
davidshepherd7 May 24, 2025
dee2788
Migrate some features to ert
davidshepherd7 May 24, 2025
45f5a55
Migrate another test file
davidshepherd7 May 24, 2025
8e0bd92
Migrate perl tests
davidshepherd7 May 24, 2025
ecd2519
Migrate C++ and pointers in functin defs
davidshepherd7 May 24, 2025
8396367
Migrate remaining languages
davidshepherd7 May 24, 2025
9a544c3
Migrate undo tests
davidshepherd7 May 24, 2025
d701338
Remove ecukes deps
davidshepherd7 May 24, 2025
a4ebe01
Add missing newlines
davidshepherd7 May 24, 2025
9c996ca
Use ert support for expected failures
davidshepherd7 May 24, 2025
66a7cb7
Rename helper functions
davidshepherd7 May 24, 2025
1e146e8
One more expected failure
davidshepherd7 May 24, 2025
7bc6d3e
Stop testing 27.2 - auctex isn't installing successfully
davidshepherd7 May 24, 2025
1347523
Fix rust mode function names
davidshepherd7 May 24, 2025
7d09616
Reorganise helpers a bit
davidshepherd7 May 24, 2025
85e77ff
Use normal quoting for th-fixtures mode
davidshepherd7 May 24, 2025
43972e6
Clean up some imports
davidshepherd7 May 24, 2025
33a8b8b
Simplify import paths
davidshepherd7 May 24, 2025
a283032
Better assert outputs
davidshepherd7 May 24, 2025
b4a7caa
Simplify use of ert-runner
davidshepherd7 May 24, 2025
27484f9
Fix using smie function instead of var
davidshepherd7 May 24, 2025
43fc686
Compile the test code
davidshepherd7 May 24, 2025
88e061d
Avoid using an interactive-only function
davidshepherd7 May 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
strategy:
matrix:
emacs_version:
- 27.2
- 28.2
- 29.1
fail-fast: false
Expand Down
2 changes: 0 additions & 2 deletions Cask
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
(source gnu)

(development
(depends-on "ecukes")
(depends-on "espuds")
(depends-on "ert-runner")

;; For testing
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ build :
clean :
@rm -f *.elc

test: unit integration
test: unit

unit: build
unit: build build-unit
${CASK} exec ert-runner

integration: build
./integration-test.sh
build-unit :
cask exec $(EMACS) -Q --batch --eval \
"(progn \
(setq byte-compile-error-on-warn t) \
(batch-byte-compile))" test-helper.el test/*-test.el

benchmark: build
${CASK} emacs -Q --batch -l ./electric-operator.elc -l ./electric-operator-benchmark.el
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ in python which works well with `electric-operator-mode`:
I'm using [Cask](https://github.com/cask/cask.el) to manage dependencies, so to
run the tests you'll need to install cask then run `cask install` to install
dependencies. Then the tests can be run with `make test` (or manually with
`ecukes` and `ert-runner`, but make sure you exclude ecukes tests tagged with
`@known-failure`).
`ert-runner`).

Bug reports are also welcome!

Expand All @@ -190,6 +189,8 @@ to be too heavy to add to electric-spacing.

### Unstable

### Version 2.1

* Fix treating comint-based modes (typically called inferior-...) as plain text
modes by default.
* Apply default python rules to inferior-python-mode, and similiarly for R.
Expand Down
2 changes: 1 addition & 1 deletion electric-operator.el
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ Also handles C++ lambda capture by reference."
;; Another caveat: it does something odd with using % as two different things
;; depending on the context, but we can't write tests for strings containing %
;; (see https://github.com/ecukes/ecukes/issues/58) so I can't really handle
;; this.
;; this. TODO: now that we're using ert maybe this is fixable?
(apply #'electric-operator-add-rules-for-mode 'perl-mode (electric-operator-get-rules-for-mode 'prog-mode))
(electric-operator-add-rules-for-mode 'perl-mode
(cons "**" " ** ") ; Exponentials
Expand Down
215 changes: 0 additions & 215 deletions features/c++-mode.feature

This file was deleted.

Loading
Loading