Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring clojure-native up to date with master HEAD #265

Merged
merged 14 commits into from
Mar 19, 2012
Merged

Bring clojure-native up to date with master HEAD #265

merged 14 commits into from
Mar 19, 2012
+262 −292

Commits on Jan 12, 2012

  1. first pass at clojure native backend

    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    ee42979 View commit details
    Browse the repository at this point in the history

  2. clean up the pom

    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    3e81094 View commit details
    Browse the repository at this point in the history

  3. delete old clojure backend

    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    8a45465 View commit details
    Browse the repository at this point in the history

  4. Merge remote branch 'origin/master' into clojure-native 

    Conflicts:
	clojure/src/main/java/cucumber/runtime/clojure/ClojureBackend.java
	clojure/src/main/java/cucumber/runtime/clojure/ClojureHook.java
	clojure/src/main/java/cucumber/runtime/clojure/ClojureHookDefinition.java
	clojure/src/main/java/cucumber/runtime/clojure/ClojureStepDefinition.java
    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    b5a5a04 View commit details
    Browse the repository at this point in the history

  5. track interface change

    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    3f7b2f2 View commit details
    Browse the repository at this point in the history

  6. lein plugin for running cukes

    @hiredman
    hiredman committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    4718430 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2012

  1. run lein plugin in project's jvm, not lein's

    @hiredman
    hiredman committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    ac66f53 View commit details
    Browse the repository at this point in the history

  2. misc hackery to deal with file paths vs. classpaths, etc

    @hiredman
    hiredman committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    94ae4d9 View commit details
    Browse the repository at this point in the history

  3. don't try and compile the lein plugin

    @hiredman
    hiredman committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    63ef1fb View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2012

  1. Merge remote branch 'origin/master' into clojure-native

    @hiredman
    hiredman committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    9cdf7a6 View commit details
    Browse the repository at this point in the history

  2. more than one world, who knew?

    @hiredman
    hiredman committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    3ed096c View commit details
    Browse the repository at this point in the history

  3. before and after hooks

    @hiredman
    hiredman committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    ad8c7a9 View commit details
    Browse the repository at this point in the history

  4. make 'lein cuke' suitable for 'lein interactive'

    @hiredman
    hiredman committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    d4ffedd View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2012

  1. Updated 'clojure-native' of https://github.com/hiredman/cucumber-jvm … 

    …to apply cleanly to master HEAD

Changed cucumber.runtime.clj to implement cucumber.runtime.clj.Backend#loadGlue
Implemented getSnippet to return the same snippets as ClojureBackend.java did
Fixed a problem with creating TagExpression in add-hook-definition
Added additional feature to execute clojure-snippet
Added Before and After step definitions to execute add-hook-definition
    @nilswloka
    nilswloka committed Mar 19, 2012
    Configuration menu
    Copy the full SHA
    dcdcef0 View commit details
    Browse the repository at this point in the history