branch: elpa/smartparens
commit e96ef297389829716f80ee9a94e17505095469ab
Merge: 3ed34cb67e 7e72c307d4
Author: Matus Goljer <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1202 from temyurchenko/master
fix some of the tests; partially addresses #1201
---
...ens-latex-test.el => smartparens-LaTeX-test.el} | 56 +++++++++++-----------
test/smartparens-delete-pair-test.el | 2 +-
test/smartparens-elixir-test.el | 2 +-
test/smartparens-latex-test.el | 2 +-
test/smartparens-org-test.el | 6 +--
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/test/smartparens-latex-test.el b/test/smartparens-LaTeX-test.el
similarity index 68%
copy from test/smartparens-latex-test.el
copy to test/smartparens-LaTeX-test.el
index c5ed6ee8be..c77f377795 100644
--- a/test/smartparens-latex-test.el
+++ b/test/smartparens-LaTeX-test.el
@@ -1,102 +1,102 @@
(require 'smartparens-latex)
-(ert-deftest
sp-test-latex-dont-insert-space-on-forward-slurp-where-not-necessary ()
+(ert-deftest
sp-test-LaTeX-dont-insert-space-on-forward-slurp-where-not-necessary ()
(sp-test-with-temp-buffer "foo (|)(bar)(baz)"
- (latex-mode)
+ (LaTeX-mode)
(sp-forward-slurp-sexp 2)
(sp-buffer-equals "foo (|(bar)(baz))")
(sp-forward-barf-sexp 2)
(sp-buffer-equals "foo (|)(bar)(baz)")))
-(ert-deftest sp-test-latex-insert-space-on-forward-slurp-where-necessary ()
+(ert-deftest sp-test-LaTeX-insert-space-on-forward-slurp-where-necessary ()
(sp-test-with-temp-buffer "foo (|bar)baz"
- (latex-mode)
+ (LaTeX-mode)
(sp-forward-slurp-sexp)
(sp-buffer-equals "foo (|bar baz)")
(sp-forward-barf-sexp)
(sp-buffer-equals "foo (|bar) baz")))
-(ert-deftest
sp-test-latex-dont-insert-space-on-backward-slurp-where-not-necessary ()
+(ert-deftest
sp-test-LaTeX-dont-insert-space-on-backward-slurp-where-not-necessary ()
(sp-test-with-temp-buffer "foo (bar)(baz)(|)"
- (latex-mode)
+ (LaTeX-mode)
(sp-backward-slurp-sexp 2)
(sp-buffer-equals "foo ((bar)(baz)|)")
(sp-backward-barf-sexp 2)
- (sp-buffer-equals "foo (bar)(baz)|()")))
+ (sp-buffer-equals "foo (bar)(baz)(|)")))
-(ert-deftest sp-test-latex-insert-space-on-backward-slurp-where-necessary ()
+(ert-deftest sp-test-LaTeX-insert-space-on-backward-slurp-where-necessary ()
(sp-test-with-temp-buffer "foo bar(baz|)"
- (latex-mode)
+ (LaTeX-mode)
(sp-backward-slurp-sexp)
(sp-buffer-equals "foo (bar baz|)")
(sp-backward-barf-sexp)
(sp-buffer-equals "foo bar (baz|)")))
-(ert-deftest sp-test-latex-navigate-single-quote-pair-backwards-at-opener ()
+(ert-deftest sp-test-LaTeX-navigate-single-quote-pair-backwards-at-opener ()
(sp-test-with-temp-buffer "\\foo{bar} `|foo bar'baz'"
- (latex-mode)
+ (LaTeX-mode)
(should (equal (sp-get-thing t)
'(:beg 11 :end 24 :op "`" :cl "'" :prefix "" :suffix "")))))
-(ert-deftest sp-test-latex-navigate-single-quote-pair-backwards-at-closer ()
+(ert-deftest sp-test-LaTeX-navigate-single-quote-pair-backwards-at-closer ()
(sp-test-with-temp-buffer "\\foo{bar} `foo bar'baz'|"
- (latex-mode)
+ (LaTeX-mode)
(should (equal (sp-get-thing t)
'(:beg 11 :end 24 :op "`" :cl "'" :prefix "" :suffix "")))))
;; SKIP:
-;; (ert-deftest
sp-test-latex-navigate-single-quote-pair-backwards-at-contraction ()
+;; (ert-deftest
sp-test-LaTeX-navigate-single-quote-pair-backwards-at-contraction ()
;; (sp-test-with-temp-buffer "\\foo{bar} `foo bar'|bar'"
-;; (latex-mode)
+;; (LaTeX-mode)
;; (should (equal (sp-get-thing t)
;; '(:beg 16 :end 19 :op "" :cl "" :prefix "" :suffix
"")))))
;; #820
-(ert-deftest
sp-test-latex-do-not-fix-closing-delimiter-on-insert-when-inserting-more-than-one-char
()
+(ert-deftest
sp-test-LaTeX-do-not-fix-closing-delimiter-on-insert-when-inserting-more-than-one-char
()
"Some electric keys sometimes insert more than one character.
In this case the behaviour is more complicated and we shouldn't
try to fix the buffer.
-For example quote in latex inserts two backticks which messes up
+For example quote in LaTeX inserts two backticks which messes up
with the search logic (if inserted one-by-one they would pair by
thesmeves and would not break unrelated pair)"
(sp-test-with-temp-buffer "quote: | $f' = 0$"
- (latex-mode)
+ (LaTeX-mode)
(execute-kbd-macro "\"")
(sp-buffer-equals "quote: ``|'' $f' = 0$")))
;; #990
-(ert-deftest sp-test-latex-do-parse-string-quotes-outside-math ()
+(ert-deftest sp-test-LaTeX-do-parse-string-quotes-outside-math ()
(sp-test-with-temp-buffer "foo ``bar''| baz"
- (latex-mode)
+ (LaTeX-mode)
(sp-backward-sexp)
(sp-buffer-equals "foo |``bar'' baz")))
;; #990
-(ert-deftest sp-test-latex-dont-parse-string-quotes-in-math ()
+(ert-deftest sp-test-LaTeX-dont-parse-string-quotes-in-math ()
(sp-test-with-temp-buffer "$foo ``bar''| baz$"
- (latex-mode)
+ (LaTeX-mode)
(sp-backward-sexp)
(sp-buffer-equals "$foo ``|bar'' baz$")))
;; #990
-(ert-deftest sp-test-latex-do-pair-string-quotes-outside-math ()
+(ert-deftest sp-test-LaTeX-do-pair-string-quotes-outside-math ()
(sp-test-with-temp-buffer "foo | baz"
- (latex-mode)
+ (LaTeX-mode)
(execute-kbd-macro "``")
(sp-buffer-equals "foo ``|'' baz")))
;; #990
-(ert-deftest sp-test-latex-dont-pair-string-quotes-in-math ()
+(ert-deftest sp-test-LaTeX-dont-pair-string-quotes-in-math ()
(sp-test-with-temp-buffer "$foo | baz$"
- (latex-mode)
+ (LaTeX-mode)
(execute-kbd-macro "``")
(sp-buffer-equals "$foo ``| baz$")))
;; #834
-(ert-deftest sp-test-latex-wrap-with-trigger ()
+(ert-deftest sp-test-LaTeX-wrap-with-trigger ()
"A region should be wrapped with a pair if trigger key is pressed."
(sp-test-with-temp-buffer "foo Mbar baz| bam"
- (latex-mode)
+ (LaTeX-mode)
(execute-kbd-macro "\"")
(sp-buffer-equals "foo ``bar baz''| bam")))
diff --git a/test/smartparens-delete-pair-test.el
b/test/smartparens-delete-pair-test.el
index eb72192932..9c6cf21789 100644
--- a/test/smartparens-delete-pair-test.el
+++ b/test/smartparens-delete-pair-test.el
@@ -13,7 +13,7 @@
(delete-backward-char 1)
(should (equal (buffer-string) "\\{")))))
-(ert-deftest sp-test-delete-pair-closing ()
+(ert-deftest sp-test-delete-pair-opening ()
(let ((sp-pairs sp--test-basic-pairs))
(sp-test-with-temp-elisp-buffer "\\{|"
(smartparens-strict-mode -1)
diff --git a/test/smartparens-elixir-test.el b/test/smartparens-elixir-test.el
index 7494e86274..3fb1b88a98 100644
--- a/test/smartparens-elixir-test.el
+++ b/test/smartparens-elixir-test.el
@@ -118,7 +118,7 @@ end"
end"
'(:beg 1 :end 87 :op "defmodule" :cl "end" :prefix "" :suffix "")))
-(ert-deftest sp-test-elixir-parse-bodyless-defp-w-keyword-list ()
+(ert-deftest sp-test-elixir-parse-bodyless-def-w-keyword-list ()
"Parse bodyless defp correctly with keyword-list body"
(sp-test-elixir-parse "|defmodule HelloWorld do
def hello
diff --git a/test/smartparens-latex-test.el b/test/smartparens-latex-test.el
index c5ed6ee8be..82b9cbe25d 100644
--- a/test/smartparens-latex-test.el
+++ b/test/smartparens-latex-test.el
@@ -22,7 +22,7 @@
(sp-backward-slurp-sexp 2)
(sp-buffer-equals "foo ((bar)(baz)|)")
(sp-backward-barf-sexp 2)
- (sp-buffer-equals "foo (bar)(baz)|()")))
+ (sp-buffer-equals "foo (bar)(baz)(|)")))
(ert-deftest sp-test-latex-insert-space-on-backward-slurp-where-necessary ()
(sp-test-with-temp-buffer "foo bar(baz|)"
diff --git a/test/smartparens-org-test.el b/test/smartparens-org-test.el
index 1be6d5a2e7..aa5f615fce 100644
--- a/test/smartparens-org-test.el
+++ b/test/smartparens-org-test.el
@@ -66,7 +66,7 @@
(execute-kbd-macro "foo /bar")
(sp-buffer-equals "foo /bar|/")))
-(ert-deftest sp-test-org-do-not-insert-star-pair-after-word ()
+(ert-deftest sp-test-org-do-not-insert-slash-pair-after-word ()
(sp-test-with-temp-buffer "|"
(org-mode)
(execute-kbd-macro "foo bar/ baz")
@@ -98,7 +98,7 @@
(execute-kbd-macro "foo ~bar")
(sp-buffer-equals "foo ~bar|~")))
-(ert-deftest sp-test-org-do-not-insert-star-pair-after-word ()
+(ert-deftest sp-test-org-do-not-insert-tilde-pair-after-word ()
(sp-test-with-temp-buffer "|"
(org-mode)
(execute-kbd-macro "foo bar~ baz")
@@ -130,7 +130,7 @@
(execute-kbd-macro "foo =bar")
(sp-buffer-equals "foo =bar|=")))
-(ert-deftest sp-test-org-do-not-insert-star-pair-after-word ()
+(ert-deftest sp-test-org-do-not-insert-equals-pair-after-word ()
(sp-test-with-temp-buffer "|"
(org-mode)
(execute-kbd-macro "foo bar= baz")
