Throw PendingException from clojure snippets. See #271.

cucumber · Mar 22, 2012 · d2b2013 · d2b2013
1 parent f99069e
commit d2b2013
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/clojure/src/main/clj/cucumber/runtime/clj.clj b/clojure/src/main/clj/cucumber/runtime/clj.clj
@@ -23,7 +23,8 @@
     (template [_]
       (str
        "({0} #\"{1}\" [{3}]\n"
-       "  (comment  {4}  ))\n"))
+       "  (comment  {4}  )\n"
+       "  (throw (cucumber.runtime.PendingException.)))\n"))
     (arguments [_ argumentTypes]
       (SnippetGenerator/untypedArguments argumentTypes))
     (namedGroupStart [_] nil)
@@ -113,8 +114,6 @@
          (.eval te tags))
        (getOrder [hd] 0)))))
 
-;; TODO: before and after hooks
-
 (defmacro step-macros [& names]
   (cons 'do
         (for [name names]

diff --git a/clojure/src/test/resources/cucumber/runtime/clojure/stepdefs.clj b/clojure/src/test/resources/cucumber/runtime/clojure/stepdefs.clj
@@ -23,3 +23,7 @@
 
 (When #"^I add (.*)$" [liquid]
   (assert (= "milk" liquid)))
+
+(Given #"^(\d+) unimplemented step$" [arg1]
+  (comment  Express the Regexp above with the code you wish you had  )
+  (throw (cucumber.runtime.PendingException.)))
diff --git a/core/src/main/java/cucumber/runtime/Runtime.java b/core/src/main/java/cucumber/runtime/Runtime.java
@@ -223,7 +223,7 @@ public void runStep(String uri, Step step, Reporter reporter, I18n i18n) {
                 match.runStep(i18n);
             } catch (Throwable t) {
                 error = t;
-                status = Result.FAILED;
+                status = (t instanceof PendingException) ? "pending" : Result.FAILED;
                 addError(t);
                 skipNextStep = true;
             } finally {