auto upstream

2 files changed, 31 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index f508209008e..7fed4f29408 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el
+        (ruby-move-to-block-skips-percent-literal): Add depth-affecting
+        bits inside the examples.
+        (ruby-move-to-block-skips-heredoc): New test.
+        (ruby-add-log-current-method-after-inner-class): Lower
+        expectations: move point inside a method, initially.
+
 2013-02-13  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 6798a49d53c..c67f92e6ed9 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -390,11 +390,13 @@ VALUES-PLIST is a list with alternating index and value elements."
                           |  class C
                           |    class D
                           |    end
-                          |    _
+                          |    def foo
+                          |      _
+                          |    end
                           |  end
                           |end")
     (search-backward "_")
-    (should (string= (ruby-add-log-current-method) "M::C"))))
+    (should (string= (ruby-add-log-current-method) "M::C#foo"))))
 
 (defvar ruby-block-test-example
   (ruby-test-string
@@ -449,20 +451,37 @@ VALUES-PLIST is a list with alternating index and value elements."
   (dolist (s (list (ruby-test-string
                     "foo do
                     |  a = %%w(
+                    |    def yaa
                     |  )
                     |end")
                    (ruby-test-string
                     "foo do
                     |  a = %%w|
+                    |    end
                     |  |
                     |end")))
     (ruby-with-temp-buffer s
       (goto-line 1)
       (ruby-end-of-block)
-      (should (= 4 (line-number-at-pos)))
+      (should (= 5 (line-number-at-pos)))
       (ruby-beginning-of-block)
       (should (= 1 (line-number-at-pos))))))
 
+(ert-deftest ruby-move-to-block-skips-heredoc ()
+  (ruby-with-temp-buffer
+      (ruby-test-string
+       "if something_wrong?
+       |  ActiveSupport::Deprecation.warn(<<-eowarn)
+       |  boo hoo
+       |  end
+       |  eowarn
+       |end")
+    (goto-line 1)
+    (ruby-end-of-block)
+    (should (= 6 (line-number-at-pos)))
+    (ruby-beginning-of-block)
+    (should (= 1 (line-number-at-pos)))))
+
 (provide 'ruby-mode-tests)
 
 ;;; ruby-mode-tests.el ends here