cucumber 0.6.4 → 0.7.0.beta.1

data/lib/cucumber/platform.rb

@@ -6,8 +6,6 @@ require 'yaml'
 module Cucumber
   version       = YAML.load_file(File.dirname(__FILE__) + '/../../VERSION.yml')
   VERSION       = [version[:major], version[:minor], version[:patch], version[:build]].compact.join('.')
-  LANGUAGE_FILE = File.expand_path(File.dirname(__FILE__) + '/languages.yml')
-  LANGUAGES     = YAML.load_file(LANGUAGE_FILE)
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rb_support/rb_language.rb

@@ -30,7 +30,12 @@ module Cucumber
     class RbLanguage
       include LanguageSupport::LanguageMethods
       attr_reader :current_world
-      
+
+      Gherkin::I18n.code_keywords.each do |adverb|
+        RbDsl.alias_adverb(adverb)
+        RbWorld.alias_adverb(adverb)
+      end
+
       def initialize(step_mother)
         @step_mother = step_mother
         @step_definitions = []
@@ -38,16 +43,6 @@ module Cucumber
         @world_proc = @world_modules = nil
       end
 
-      # Tell the language about other i18n translations so that
-      # they can alias Given, When Then etc. Only useful if the language
-      # has a mechanism for this - typically a dynamic language.
-      def alias_adverbs(adverbs)
-        adverbs.each do |adverb|
-          RbDsl.alias_adverb(adverb)
-          RbWorld.alias_adverb(adverb)
-        end
-      end
-
       # Gets called for each file under features (or whatever is overridden
       # with --require).
       def step_definitions_for(rb_file)
@@ -88,7 +83,7 @@ module Cucumber
           multiline_class_comment = "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  "
         end
 
-        "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
+        "#{Gherkin::I18n.code_keyword_for(step_keyword)} /^#{escaped}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
       end
 
       def begin_rb_scenario(scenario)

data/lib/cucumber/step_mother.rb

@@ -1,6 +1,5 @@
 require 'cucumber/constantize'
 require 'cucumber/core_ext/instance_exec'
-require 'cucumber/parser/natural_language'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/formatter/duration'
 require 'timeout'
@@ -49,7 +48,6 @@ module Cucumber
       @unsupported_programming_languages = []
       @programming_languages = []
       @language_map = {}
-      load_natural_language('en')
       @current_scenario = nil
     end
 
@@ -96,20 +94,11 @@ module Cucumber
       return @language_map[ext] if @language_map[ext]
       programming_language_class = constantize("Cucumber::#{ext.capitalize}Support::#{ext.capitalize}Language")
       programming_language = programming_language_class.new(self)
-      programming_language.alias_adverbs(@adverbs || [])
       @programming_languages << programming_language
       @language_map[ext] = programming_language
       programming_language
     end
 
-    # Loads a natural language. This has the effect of aliasing 
-    # Step Definition keywords for all of the registered programming 
-    # languages (if they support aliasing). See #load_programming_language
-    #
-    def load_natural_language(lang)
-      Parser::NaturalLanguage.get(self, lang)
-    end
-
     # Returns the options passed on the command line.
     def options
       @options ||= {}
@@ -133,7 +122,7 @@ module Cucumber
     # nicer, and in all outputs (in case you use several formatters)
     #
     def announce(msg)
-      @visitor.announce(msg.to_s)
+      msg.respond_to?(:join) ? @visitor.announce(msg.join("\n")) : @visitor.announce(msg.to_s)
     end
 
     # Suspends execution and prompts +question+ to the console (STDOUT).
@@ -240,8 +229,7 @@ module Cucumber
       if Array === text_or_table
         Ast::Table.new(text_or_table)
       else
-        @table_parser ||= Parser::TableParser.new
-        @table_parser.parse_or_fail(text_or_table.strip, file, line_offset)
+        Ast::Table.parse(text_or_table)
       end
     end
 
@@ -255,13 +243,12 @@ module Cucumber
     # Is retured as: " hello\nworld"
     #
     def py_string(string_with_triple_quotes, file=nil, line_offset=0)
-      @py_string_parser ||= Parser::PyStringParser.new
-      @py_string_parser.parse_or_fail(string_with_triple_quotes, file, line_offset).to_s
+      Ast::PyString.parse(string_with_triple_quotes)
     end
 
     def step_match(step_name, name_to_report=nil) #:nodoc:
       matches = @programming_languages.map do |programming_language| 
-        programming_language.step_matches(step_name, name_to_report)
+        programming_language.step_matches(step_name, name_to_report).to_a
       end.flatten
       raise Undefined.new(step_name) if matches.empty?
       matches = best_matches(step_name, matches) if matches.size > 1 && options[:guess]
@@ -309,15 +296,6 @@ module Cucumber
       scenario_visited(scenario)
     end
 
-    def register_adverbs(adverbs) #:nodoc:
-      @adverbs ||= []
-      @adverbs += adverbs
-      @adverbs.uniq!
-      @programming_languages.each do |programming_language|
-        programming_language.alias_adverbs(@adverbs)
-      end
-    end
-    
     def before(scenario) #:nodoc:
       return if options[:dry_run] || @current_scenario
       @current_scenario = scenario

data/spec/cucumber/ast/background_spec.rb

@@ -9,7 +9,6 @@ module Cucumber
       before do
         extend(Cucumber::RbSupport::RbDsl)
         @step_mother = Cucumber::StepMother.new
-        @step_mother.load_natural_language('en')
         @rb = @step_mother.load_programming_language('rb')
 
         $x = $y = nil

data/spec/cucumber/ast/feature_factory.rb

@@ -24,10 +24,7 @@ module Cucumber
           %w{1 22 333},
           %w{4444 55555 666666}
         ])
-        py_string = Ast::PyString.new(21, 22, %{
-           I like
-          Cucumber sandwich
-        }, ' '*10)
+        py_string = Ast::PyString.new(%{\n I like\nCucumber sandwich\n})
         
         background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
           [
@@ -39,6 +36,7 @@ module Cucumber
           background,
           Ast::Comment.new("# My feature comment\n"),
           Ast::Tags.new(6, ['one', 'two']),
+          "Feature",
           "Pretty printing",
           [Ast::Scenario.new(
             background,

data/spec/cucumber/ast/feature_spec.rb

@@ -8,7 +8,6 @@ module Cucumber
 
       it "should convert to sexp" do
         step_mother = Cucumber::StepMother.new
-        step_mother.load_natural_language('en')
         step_mother.load_programming_language('rb')
         dsl = Object.new 
         dsl.extend Cucumber::RbSupport::RbDsl
@@ -47,7 +46,6 @@ module Cucumber
 
       it "should store OS specific file paths" do
         step_mother = Cucumber::StepMother.new
-        step_mother.load_natural_language('en')
         step_mother.load_programming_language('rb')
         dsl = Object.new 
         dsl.extend Cucumber::RbSupport::RbDsl

data/spec/cucumber/ast/py_string_spec.rb

@@ -4,21 +4,10 @@ require 'cucumber/ast/py_string'
 module Cucumber
   module Ast
     describe PyString do
-      it "should handle unindented" do
-        ps = PyString.new(10, 13, "4.1\n4.2\n", "")
-        ps.to_s.should == "4.1\n4.2\n"
-      end
-
-      it "should handle indented" do
-        #                    """
-        ps = PyString.new(10, 13, "     4.1\n   4.2\n", "  ")
-        ps.to_s.should == "   4.1\n 4.2\n"
-      end
-      
       describe "replacing arguments" do
 
         before(:each) do
-          @ps = PyString.new(10, 13, "<book>\n<qty>\n", "")
+          @ps = PyString.new("<book>\n<qty>\n")
         end
       
         it "should return a new py_string with arguments replaced with values" do
@@ -34,7 +23,7 @@ module Cucumber
         end
 
         it "should replaced nil with empty string" do
-          ps = PyString.new(10, 13, "'<book>'", "")
+          ps = PyString.new("'<book>'")
           py_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
           
           py_string_with_replaced_arg.to_s.should == "''"

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -10,7 +10,6 @@ module Cucumber
       before do
         @step_mother = Cucumber::StepMother.new
         @step_mother.load_programming_language('rb')
-        @step_mother.load_natural_language('en')
         @dsl = Object.new
         @dsl.extend(Cucumber::RbSupport::RbDsl)
 

data/spec/cucumber/ast/scenario_spec.rb

@@ -8,7 +8,6 @@ module Cucumber
     describe Scenario do
       before do
         @step_mother = Cucumber::StepMother.new
-        @step_mother.load_natural_language('en')
         @step_mother.load_programming_language('rb')
         @dsl = Object.new
         @dsl.extend(Cucumber::RbSupport::RbDsl)

data/spec/cucumber/ast/step_spec.rb

@@ -48,7 +48,7 @@ module Cucumber
       end
 
       it "should replace arguments in py string arg" do
-        py_string = PyString.new(1, 2, 'taste_<taste> color_<color>', '')
+        py_string = PyString.new('taste_<taste> color_<color>')
 
         step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
 

data/spec/cucumber/ast/table_spec.rb

@@ -349,6 +349,7 @@ module Cucumber
               | a | b |
               | c | d |
             })
+            @t.should_not == nil
           end
           
           it "should raise on missing rows" do
@@ -409,8 +410,7 @@ module Cucumber
         end
 
         def table(text, file=nil, line_offset=0)
-          @table_parser ||= Cucumber::Parser::TableParser.new
-          @table_parser.parse_or_fail(text.strip, file, line_offset)
+          Table.parse(text)
         end
       end
 

data/spec/cucumber/cli/main_spec.rb

@@ -20,7 +20,7 @@ module Cucumber
       describe "verbose mode" do
 
         before(:each) do
-          @empty_feature = Cucumber::Ast::Feature.new(nil, Cucumber::Ast::Comment.new(''), Cucumber::Ast::Tags.new(2, []), "Feature", [])
+          @empty_feature = Cucumber::Ast::Feature.new(nil, Cucumber::Ast::Comment.new(''), Cucumber::Ast::Tags.new(2, []), "Feature", "Foo", [])
         end
 
         it "should show feature files parsed" do

data/spec/cucumber/cli/options_spec.rb

@@ -56,10 +56,10 @@ module Cli
         context "with LANG specified as 'help'" do
           it "lists all known langues" do
             when_parsing '--i18n help' do
-              require 'cucumber/cli/language_help_formatter'
-              LanguageHelpFormatter.should_receive(:list_languages).with(output_stream)
+              Kernel.should_receive(:exit)
             end
           end
+
           it "exits the program" do
             when_parsing('--i18n help') { Kernel.should_receive(:exit) }
           end

data/spec/cucumber/formatter/html_spec.rb

@@ -25,7 +25,7 @@ module Cucumber
       end
     
       it "should not raise an error when visiting a blank feature name" do
-        lambda { @formatter.feature_name("") }.should_not raise_error
+        lambda { @formatter.feature_name("Feature", "") }.should_not raise_error
       end
       
       describe "given a single feature" do
@@ -50,6 +50,7 @@ module Cucumber
         describe "with a comment" do
           define_feature <<-FEATURE
             # Healthy
+            Feature: Foo
           FEATURE
         
           it { @out.string.should =~ /^\<!DOCTYPE/ }
@@ -60,6 +61,7 @@ module Cucumber
         describe "with a tag" do
           define_feature <<-FEATURE
             @foo
+            Feature: can't have standalone tag :)
           FEATURE
 
           it { @doc.should have_css_node('.feature .tag', /foo/) }
@@ -90,6 +92,8 @@ module Cucumber
       
         describe "with a scenario" do
           define_feature <<-FEATURE
+          Feature: Banana party
+
             Scenario: Monkey eats banana
               Given there are bananas
           FEATURE
@@ -100,6 +104,8 @@ module Cucumber
       
         describe "with a scenario outline" do
           define_feature <<-FEATURE
+          Feature: Fud Pyramid
+
             Scenario Outline: Monkey eats a balanced diet
               Given there are <Things>
           
@@ -122,6 +128,8 @@ module Cucumber
       
         describe "with a step with a py string" do
           define_feature <<-FEATURE
+          Feature: Traveling circus
+
             Scenario: Monkey goes to town
               Given there is a monkey called:
                """
@@ -134,6 +142,8 @@ module Cucumber
 
         describe "with a multiline step arg" do
           define_feature <<-FEATURE
+          Feature: Traveling circus
+
             Scenario: Monkey goes to town
               Given there are monkeys:
                | name |
@@ -146,6 +156,8 @@ module Cucumber
       
         describe "with a table in the background and the scenario" do
           define_feature <<-FEATURE
+          Feature: accountant monkey
+
             Background:
               Given table:
                 | a | b |
@@ -161,6 +173,8 @@ module Cucumber
       
         describe "with a py string in the background and the scenario" do
           define_feature <<-FEATURE
+          Feature: py strings
+
             Background:
               Given stuff:
                 """
@@ -183,6 +197,8 @@ module Cucumber
           end
         
           define_feature(<<-FEATURE)
+          Feature: Animal Cruelty
+
             Scenario: Monkey gets a fright
               Given boo
             FEATURE
@@ -196,6 +212,7 @@ module Cucumber
           end
         
           define_feature(<<-FEATURE)
+          Feature: shouting
             Background:
               Given boo
             Scenario:
@@ -213,6 +230,7 @@ module Cucumber
           end
 
           define_feature(<<-FEATURE)
+          Feature: 
             Scenario:
               Given snap
             FEATURE
@@ -222,6 +240,7 @@ module Cucumber
         
         describe "with an undefined Given step then an undefined And step" do
           define_feature(<<-FEATURE)
+          Feature: 
             Scenario:
               Given some undefined step
               And another undefined step

data/spec/cucumber/formatter/junit_spec.rb

@@ -25,6 +25,7 @@ module Cucumber::Formatter
     
     describe "a feature with no name" do
       define_feature <<-FEATURE
+        Feature:
           Scenario: Passing
             Given a passing scenario
       FEATURE

data/spec/cucumber/formatter/spec_helper.rb

@@ -27,14 +27,12 @@ module Cucumber
       def load_features(content)
         feature_file = FeatureFile.new('spec.feature', content)
         features = Ast::Features.new
-        feature = feature_file.parse(@step_mother, {})
-        features.add_feature(feature)
+        feature = feature_file.parse(@step_mother, options)
+        features.add_feature(feature) if feature
         features
       end
     
       def run(features)
-        # options = { :verbose => true }
-        options = {}
         tree_walker = Cucumber::Ast::TreeWalker.new(@step_mother, [@formatter], options, STDOUT)
         tree_walker.visit_features(features)
       end
@@ -46,6 +44,10 @@ module Cucumber
         dsl.extend RbSupport::RbDsl
         dsl.instance_exec &step_defs
       end 
+
+      def options
+        @options ||= mock(Cucumber::Cli::Options, :filters => [], :[] => nil)
+      end
     end
   end
-end
+end

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -9,7 +9,6 @@ module Cucumber
     describe RbStepDefinition do
       before do      
         @step_mother = Cucumber::StepMother.new
-        @step_mother.load_natural_language('en')
         @rb = @step_mother.load_programming_language('rb')
         @dsl = Object.new 
         @dsl.extend Cucumber::RbSupport::RbDsl

data/spec/cucumber/step_mother_spec.rb

@@ -10,7 +10,7 @@ module Cucumber
       @dsl.extend(RbSupport::RbDsl)
 
       @step_mother = StepMother.new
-      @step_mother.load_natural_language('en')
+
       @rb = @step_mother.load_programming_language('rb')
 
       @visitor = mock('Visitor')
@@ -179,7 +179,7 @@ or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.
       @dsl.extend(RbSupport::RbDsl)
 
       @step_mother = StepMother.new
-      @step_mother.load_natural_language('en')
+
       @rb = @step_mother.load_programming_language('rb')
     end