Permalink
Browse files

fix conflicts in merge

  • Loading branch information...
2 parents 9de70ac + 0b0b02c commit a8c0de3db851c878e96207936533e1b77076dc58 @rplevy-draker committed Mar 20, 2012
Showing with 2 additions and 0 deletions.
  1. +1 −0 History.md
  2. +1 −0 clojure/src/test/java/cucumber/runtime/clojure/ClojureSnippetTest.java
View
@@ -1,6 +1,7 @@
## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC21...master)
* [Core] Fix broken --tags option (and get rid of JCommander for CLI parsing). ([#266](https://github.com/cucumber/cucumber-jvm/issues/266) Aslak Hellesøy)
+* [Clojure] Make Clojure DSL syntax cleaner ([#244](https://github.com/cucumber/cucumber-jvm/issues/244) [#267](https://github.com/cucumber/cucumber-jvm/pull/267) rplevy-draker)
* [Clojure] Native Clojure backend ([#138](https://github.com/cucumber/cucumber-jvm/pull/138) [#265](https://github.com/cucumber/cucumber-jvm/pull/265) Kevin Downey, Nils Wloka)
* [JUnit] Added `format` attribute to `@Cucumber.Options` (Aslak Hellesøy)
@@ -16,6 +16,7 @@ public void generatesPlainSnippet() {
String snippet = new SnippetGenerator(new ClojureSnippet()).getSnippet(step);
String expected = "" +
"(Given #\"^I have (\\d+) cukes in my \"([^\"]*)\" belly$\" [arg1, arg2]\n" +
+<<<<<<< HEAD
" (comment Express the Regexp above with the code you wish you had ))\n";
assertEquals(expected, snippet);
}

0 comments on commit a8c0de3

Please sign in to comment.