diff --git a/Gemfile b/Gemfile index e5504205..1c4a9ff5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "http://rubygems.org" gemspec -unless ENV['TM_RUBY'] +if !ENV['TM_RUBY'] && File.directory?('../cucumber') @dependencies.reject!{|dep| dep.name == 'cucumber'} gem 'cucumber', :path => '../cucumber' end \ No newline at end of file diff --git a/README_JAVASCRIPT.md b/README_JAVASCRIPT.md index b32ca78e..bdd6be6a 100644 --- a/README_JAVASCRIPT.md +++ b/README_JAVASCRIPT.md @@ -9,4 +9,16 @@ Or: (using therubyracer) rake js/lib/gherkin/lexer/i18n/en.js && ruby js/example/print.rb spec/gherkin/fixtures/1.feature -That prints gherkin to stdout - almost like the original. Well, not quite, but you get the idea. We're firing events. \ No newline at end of file +That prints gherkin to stdout - almost like the original. Well, not quite, but you get the idea. We're firing events. + +Trying out the lexer in a browser (only tried with Chrome) +========================================================== + +After you have built the lexer (see steps above), pull in the Ace editor: + + git submodule update --init + +(This is not *really* needed in order to test the lexer, but it's nice to see gherkin.js playing +nice along with Ace - they will most likely be used together). Open the demo page: + + open js/example/index.html \ No newline at end of file diff --git a/js/example/index.html b/js/example/index.html index 8f4c8cd3..5601ac44 100644 --- a/js/example/index.html +++ b/js/example/index.html @@ -91,7 +91,7 @@
# This is just a demo of syntax highlighting # And very basic syntax checking (based on gherkin.js) -# Try to introduce a syntax error (Replace Scenario with a different +# Try to introduce a syntax error (Replace When with a different # string). This will colour that line red. Feature: Hello World Scenario: Look Ma