[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114617: * test/automated/ruby-mode-tests.el (ruby-w
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114617: * test/automated/ruby-mode-tests.el (ruby-with-temp-buffer): Move before |
Date: |
Thu, 10 Oct 2013 21:44:05 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114617
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 17:43:47 -0400
message:
* test/automated/ruby-mode-tests.el (ruby-with-temp-buffer): Move before
first use.
(ruby-should-indent): Use indent-according-to-mode.
(ruby-deftest-move-to-block): Use `declare'.
modified:
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/ruby-mode-tests.el
rubymodetests.el-20120720101201-mn39s4kfopdxj3ek-1
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2013-10-10 02:33:35 +0000
+++ b/test/ChangeLog 2013-10-10 21:43:47 +0000
@@ -1,3 +1,10 @@
+2013-10-10 Stefan Monnier <address@hidden>
+
+ * automated/ruby-mode-tests.el (ruby-with-temp-buffer): Move before
+ first use.
+ (ruby-should-indent): Use indent-according-to-mode.
+ (ruby-deftest-move-to-block): Use `declare'.
+
2013-10-07 Dmitry Gutov <address@hidden>
* indent/ruby.rb: Fix a spurious change, add more failing examples.
=== modified file 'test/automated/ruby-mode-tests.el'
--- a/test/automated/ruby-mode-tests.el 2013-10-09 03:18:01 +0000
+++ b/test/automated/ruby-mode-tests.el 2013-10-10 21:43:47 +0000
@@ -24,10 +24,17 @@
(require 'ert)
(require 'ruby-mode)
+(defmacro ruby-with-temp-buffer (contents &rest body)
+ (declare (indent 1) (debug t))
+ `(with-temp-buffer
+ (insert ,contents)
+ (ruby-mode)
+ ,@body))
+
(defun ruby-should-indent (content column)
"Assert indentation COLUMN on the last line of CONTENT."
(ruby-with-temp-buffer content
- (ruby-indent-line)
+ (indent-according-to-mode)
(should (= (current-indentation) column))))
(defun ruby-should-indent-buffer (expected content)
@@ -38,13 +45,6 @@
(indent-region (point-min) (point-max))
(should (string= (ruby-test-string expected) (buffer-string)))))
-(defmacro ruby-with-temp-buffer (contents &rest body)
- (declare (indent 1) (debug t))
- `(with-temp-buffer
- (insert ,contents)
- (ruby-mode)
- ,@body))
-
(defun ruby-test-string (s &rest args)
(apply 'format (replace-regexp-in-string "^[ \t]*|" "" s) args))
@@ -471,6 +471,7 @@
|end"))
(defmacro ruby-deftest-move-to-block (name &rest body)
+ (declare (indent defun))
`(ert-deftest ,(intern (format "ruby-move-to-block-%s" name)) ()
(with-temp-buffer
(insert ruby-block-test-example)
@@ -478,8 +479,6 @@
(goto-char (point-min))
,@body)))
-(put 'ruby-deftest-move-to-block 'lisp-indent-function 'defun)
-
(ruby-deftest-move-to-block works-on-do
(forward-line 10)
(ruby-end-of-block)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114617: * test/automated/ruby-mode-tests.el (ruby-with-temp-buffer): Move before,
Stefan Monnier <=