Replace s-index-of with cl-position in test helpers

Drop the optional dependency on the s.el library by using cl-position
(from cl-lib, already required) instead of s-index-of for finding the
pipe character position in test strings.

Author: bbatsov

test/clojure-mode-indentation-test.el

@@ -26,7 +26,6 @@
 (require 'clojure-mode)
 (require 'cl-lib)
 (require 'buttercup)
-(require 's nil t)               ;Don't burp if it's missing during compilation.
 (require 'test-helper "test/utils/test-helper")
 
 (defmacro when-indenting-with-point-it (description before after)
@@ -46,7 +45,7 @@ DESCRIPTION is a string with the description of the spec."
   `(it ,description
     (let* ((after ,after)
            (clojure-indent-style 'always-align)
-           (expected-cursor-pos (1+ (s-index-of "|" after)))
+           (expected-cursor-pos (1+ (cl-position ?| after)))
            (expected-state (delete ?| after)))
       (with-clojure-buffer ,before
         (goto-char (point-min))

test/utils/test-helper.el

@@ -23,6 +23,8 @@
 
 ;;; Code:
 
+(require 'cl-lib)
+
 (message "Running tests on Emacs %s" emacs-version)
 
 (defmacro with-clojure-buffer (text &rest body)
@@ -78,7 +80,7 @@ DESCRIPTION is a string with the description of the spec."
   (declare (indent 1))
   `(it ,description
      (let* ((after ,after)
-            (expected-cursor-pos (1+ (s-index-of "|" after)))
+            (expected-cursor-pos (1+ (cl-position ?| after)))
             (expected-state (delete ?| after)))
        (with-clojure-buffer ,before
          (goto-char (point-min))