features/language_from_header.feature lib/cucumber/feature_file.rb lib/cucumber/filter.rb lib/cucumber/parser/i18n/language.rb @@ -1,5 +1,19 @@ == 0.3.12 (In Git) +The Egality release + +English is not the world's most spoken language, so why should Cucumber force non-English speakers to use the +--language flag? As of this release you're no longer forced to do that. Instead, you can add a comment header +to your .feature files: + + # language: fr + Fonctionnalité: Trou de boulette + +If you don't have that header, Cucumber will work as before - using whatever you specified with --language, +or default to English if no --language option was specified. A nice side effect of this is that you can now +have features in several languages side by side and run them in the same cucumber. (Not recommended unless +you want to take polyglot programming to an extreme level). + === Bugfixes * JUnit formatter uses original file name instead of narrative to avoid accidental duplicate XML files (Aslak Hellesøy) * rake gems no longer lists cucumber as a [F]ramework gem (David Chelimsky) @@ -7,6 +21,7 @@ * Make sure script/generate cucumber --spork uses the cucumber Rails environment (Philippe Lafoucrière) === New Features +* Possibility to specify scenario language as part of the .feature file (#345 Aslak Hellesøy) * Support specifying environment variables using foo=bar syntax on command line or in profiles (#362 Bryan Helmkamp) * Display failing scenarios at the end of pretty format to make it easier for people to play them back (#360 Ryan Bigg) History.txt @@ -256,6 +256,7 @@ features/expand.feature features/html_formatter.feature features/html_formatter/a.html features/junit_formatter.feature +features/language_from_header.feature features/multiline_names.feature features/rake_task.feature features/report_called_undefined_steps.feature @@ -307,6 +308,8 @@ lib/cucumber/core_ext/exception.rb lib/cucumber/core_ext/instance_exec.rb lib/cucumber/core_ext/proc.rb lib/cucumber/core_ext/string.rb +lib/cucumber/feature_file.rb +lib/cucumber/filter.rb lib/cucumber/formatter/ansicolor.rb lib/cucumber/formatter/color_io.rb lib/cucumber/formatter/console.rb @@ -328,6 +331,7 @@ lib/cucumber/parser.rb lib/cucumber/parser/feature.rb lib/cucumber/parser/feature.tt lib/cucumber/parser/i18n.tt +lib/cucumber/parser/i18n/language.rb lib/cucumber/parser/table.rb lib/cucumber/parser/table.tt lib/cucumber/parser/treetop_ext.rb Manifest.txt @@ -61,8 +61,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p| #p.extra_deps = [] # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ] p.extra_deps = [ ['term-ansicolor', '>= 1.0.3'], - ['treetop', '>= 1.2.5'], - ['polyglot', '>= 0.2.5'], # Remove this when Treetop no longer loads polyglot by default. + ['treetop', '>= 1.2.6'], ['diff-lcs', '>= 1.1.2'], ['builder', '>= 2.1.2'] ] config/hoe.rb @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{cucumber} - s.version = "0.3.11.3" + s.version = "0.3.11.4" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Aslak Helles\303\270y"] - s.date = %q{2009-06-07} + s.date = %q{2009-06-15} s.default_executable = %q{cucumber} s.description = %q{Executable Feature scenarios} s.email = ["aslak.hellesoy@gmail.com"] @@ -26,21 +26,18 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.3"]) - s.add_runtime_dependency(%q<treetop>, [">= 1.2.5"]) - s.add_runtime_dependency(%q<polyglot>, [">= 0.2.5"]) + s.add_runtime_dependency(%q<treetop>, [">= 1.2.6"]) s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"]) s.add_runtime_dependency(%q<builder>, [">= 2.1.2"]) else s.add_dependency(%q<term-ansicolor>, [">= 1.0.3"]) - s.add_dependency(%q<treetop>, [">= 1.2.5"]) - s.add_dependency(%q<polyglot>, [">= 0.2.5"]) + s.add_dependency(%q<treetop>, [">= 1.2.6"]) s.add_dependency(%q<diff-lcs>, [">= 1.1.2"]) s.add_dependency(%q<builder>, [">= 2.1.2"]) end else s.add_dependency(%q<term-ansicolor>, [">= 1.0.3"]) - s.add_dependency(%q<treetop>, [">= 1.2.5"]) - s.add_dependency(%q<polyglot>, [">= 0.2.5"]) + s.add_dependency(%q<treetop>, [">= 1.2.6"]) s.add_dependency(%q<diff-lcs>, [">= 1.1.2"]) s.add_dependency(%q<builder>, [">= 2.1.2"]) end cucumber.gemspec @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language ar} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/ar/Rakefile @@ -1,3 +1,4 @@ +# language: ar خاصية: الجمع من اجل تجنب الأخطاء السخيفة كشخص غبي في الرياضيات examples/i18n/ar/features/addition.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language bg} + t.cucumber_opts = %w{--format pretty} end examples/i18n/bg/Rakefile @@ -1,3 +1,4 @@ +# language: bg Функционалност: Събиране на числа За да не го правят наум Потребителите examples/i18n/bg/features/addition.feature @@ -1,3 +1,4 @@ +# language: bg Функционалост: Последователни изчисления За да не го правят наум Потребителите examples/i18n/bg/features/consecutive_calculations.feature @@ -1,3 +1,4 @@ +# language: bg Фунцкционалност: Делене на числа За да не го правят наум Потребителите examples/i18n/bg/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language cat} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/cat/Rakefile @@ -1,3 +1,4 @@ +# language: cat Característica: Suma Per evitar fer errors tontos Com un matemàtic idiota examples/i18n/cat/features/suma.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language da} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/da/Rakefile @@ -1,3 +1,4 @@ +# language: da Egenskab: Summering For at slippe for at lave dumme fejl Som en regnskabsfører examples/i18n/da/features/summering.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language de} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/de/Rakefile @@ -1,3 +1,4 @@ +# language: de Funktionalität: Addition Um dumme Fehler zu vermeiden möchte ich als Matheidiot examples/i18n/de/features/addition.feature @@ -1,3 +1,4 @@ +# language: de Funktionalität: Division Um dumme Fehler zu vermeiden müssen Kassierer in der Lage sein einen Bruchteil zu berechnen examples/i18n/de/features/division.feature @@ -1,4 +1,4 @@ -# stuffing.feature +# language: en-lol OH HAI: STUFFING MISHUN: CUCUMBR examples/i18n/en-lol/features/stuffing.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language en} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/en/Rakefile @@ -1,3 +1,4 @@ +# language: en Feature: Addition In order to avoid silly mistakes As a math idiot examples/i18n/en/features/addition.feature @@ -1,3 +1,4 @@ +# language: en Feature: Division In order to avoid silly mistakes Cashiers must be able to calculate a fraction examples/i18n/en/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language es} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/es/Rakefile @@ -1,3 +1,4 @@ +# language: es Característica: adición Para evitar hacer errores tontos Como un matemático idiota examples/i18n/es/features/adicion.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language et} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/et/Rakefile @@ -1,3 +1,4 @@ +# language: et Omadus: Jagamine Rumalate vigade vältimiseks Peavad kassapidajad saama arvutada murdudes examples/i18n/et/features/jagamine.feature @@ -1,3 +1,4 @@ +# language: et Omadus: Liitmine Selleks et vältida rumalaid vigu Olles matemaatika-puupea examples/i18n/et/features/liitmine.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language fi} + t.cucumber_opts = %w{--format pretty} end examples/i18n/fi/Rakefile @@ -1,3 +1,4 @@ +# language: fi Ominaisuus: Jakolasku Välttyäkseen hölmöiltä virheiltä Kassanhoitajan on voitava laskea osamäärä examples/i18n/fi/features/jakolasku.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language fr} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/fr/Rakefile @@ -1,7 +1,8 @@ +# language: fr Fonctionnalité: Addition Afin de gagner du temps lors du calcul de la facture En tant que commerçant - Je souhaite pouvoir faire une additionn + Je souhaite pouvoir faire une addition Plan du Scénario: Addition de deux nombres Soit une calculatrice examples/i18n/fr/features/addition.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language he} + t.cucumber_opts = %w{--format pretty} end examples/i18n/he/Rakefile @@ -1,3 +1,4 @@ +# language: he תכונה: חיבור כדי למנוע טעויות טפשיות בתור בור מתמטי examples/i18n/he/features/addition.feature @@ -1,3 +1,4 @@ +# language: he תכונה: חילוק כדי למנוע טעויות טפשיות לקופאים חייבת להיות יכולת לחשב שבר examples/i18n/he/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language hu} + t.cucumber_opts = %w{--format pretty} end examples/i18n/hu/Rakefile @@ -1,3 +1,4 @@ +# language: hu Jellemző: Összeadás Azért, hogy elkerüljem a buta hibákat amit diszkalkúliásként elkövethetek, examples/i18n/hu/features/addition.feature @@ -1,3 +1,4 @@ +# language: hu Jellemző: Osztás Azért, hogy elkerüljem a buta hibákat a számológépeknek tudniuk kell osztani. examples/i18n/hu/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language id} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/id/Rakefile @@ -1,3 +1,4 @@ +# language: id Fitur: Addition Untuk menghindari kesalahan konyol Sebagai orang yang gak bisa matematika examples/i18n/id/features/addition.feature @@ -1,3 +1,4 @@ +# language: id Fitur: Division Untuk hindari kesalahan konyol Kasir harus dapat menghitung pembagian examples/i18n/id/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language it} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/it/Rakefile @@ -1,3 +1,4 @@ +# language: it Funzionalità: somma Per evitare di fare errori stupidi Come utente examples/i18n/it/features/somma.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language ja} + t.cucumber_opts = %w{--format pretty} end examples/i18n/ja/Rakefile @@ -1,3 +1,4 @@ +# language: ja フィーチャ: 加算 バカな間違いを避けるために 数学オンチとして examples/i18n/ja/features/addition.feature @@ -1,3 +1,4 @@ +# language: ja フィーチャ: 除算 バカな間違いを避けるために 有理数も計算できること examples/i18n/ja/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language ko} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/ko/Rakefile @@ -1,3 +1,4 @@ +# language: ko 기능: 덧셈 예기치못한 실수을 방지하기 위해 수학을 잘 못하는 사람으로써 examples/i18n/ko/features/addition.feature @@ -1,3 +1,4 @@ +# language: ko 기능: 나눗셈 예기치못한 실수을 방지하기 위해 분수를 계산 능력 요구한다 examples/i18n/ko/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language lt} + t.cucumber_opts = %w{--format pretty} end examples/i18n/lt/Rakefile @@ -1,3 +1,4 @@ +# language: lt Sąvybė: Sudėtis Norint išvengti kvailų klaidų Kaip matematinis idiotas examples/i18n/lt/features/addition.feature @@ -1,3 +1,4 @@ +# language: lt Feature: Dalyba Norint išvengti klaidų Kasininkai privalo mokėti skaičiuoti trupmenas examples/i18n/lt/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language lv} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/lv/Rakefile @@ -1,3 +1,4 @@ +# language: lv Funkcionalitāte: Saskaitīšana Lai izvairītos no muļķīgām kļūdām Kā matemātikas idiots examples/i18n/lv/features/addition.feature @@ -1,3 +1,4 @@ +# language: lv Funkcionalitāte: Dalīšana Lai izvairītos no muļķīgām kļūdām Kasieriem ir jāprot aprēķināt daļas examples/i18n/lv/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language no} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/no/Rakefile @@ -1,3 +1,4 @@ +# language: no Egenskap: Summering For å slippe å gjøre dumme feil Som en regnskapsfører examples/i18n/no/features/summering.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language pl} + t.cucumber_opts = %w{--format pretty} end examples/i18n/pl/Rakefile @@ -1,3 +1,4 @@ +# language: pl Właściwość: Dodawanie W celu uniknięcia głupich błędów Jako matematyczny idiota examples/i18n/pl/features/addition.feature @@ -1,3 +1,4 @@ +# language: pl Właściwość: Dzielenie W celu uniknięcia głupich błędów Kasjer musi znać się na ułamkach examples/i18n/pl/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language pt} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/pt/Rakefile @@ -1,3 +1,4 @@ +# language: pt Funcionalidade: Adição Para evitar erros bobos Como um péssimo matemático examples/i18n/pt/features/adicao.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language ro} + t.cucumber_opts = %w{--format pretty} end examples/i18n/ro/Rakefile @@ -1,3 +1,4 @@ +# language: ro Functionalitate: suma Pentru a nu face erori stupide Ca utilizator examples/i18n/ro/features/suma.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language ru} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/ru/Rakefile @@ -1,3 +1,4 @@ +# language: ru Функционал: Сложение чисел Чтобы не складывать в уме Все, у кого с этим туго examples/i18n/ru/features/addition.feature @@ -1,3 +1,4 @@ +# language: ru Функционал: Последовательные вычисления Чтобы вычислять сложные выражения Пользователи хотят проводить вычисления над результатом предыдущей операций examples/i18n/ru/features/consecutive_calculations.feature @@ -1,3 +1,4 @@ +# language: ru Функционал: Деление чисел Поскольку деление сложный процесс и люди часто допускают ошибки Нужно дать им возможность делить на калькуляторе examples/i18n/ru/features/division.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language se} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/se/Rakefile @@ -1,3 +1,4 @@ +# language: se Egenskap: Summering För att slippa att göra dumma fel Som räknare examples/i18n/se/features/summering.feature @@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib') require 'cucumber/rake/task' Cucumber::Rake::Task.new do |t| - t.cucumber_opts = %w{--language sk} + t.cucumber_opts = %w{--format pretty} end \ No newline at end of file examples/i18n/sk/Rakefile @@ -1,3 +1,4 @@ +# language: sk Požiadavka: Sčítavanie Aby som sa vyhol hlúpym chybám Ako matematický idiot examples/i18n/sk/features/addition.feature @@ -1,3 +1,4 @@ +# language: sk Požiadavka: Delenie Aby som sa vyhol hlúpym chybám Pokladníci musia vedieť vypočítať podiel examples/i18n/sk/features/division.feature @@ -1,3 +1,4 @@ +# language: zh-CN 功能:加法 为了避免一些愚蠢的错误 作为一个数学白痴 examples/i18n/zh-CN/features/addition.feature @@ -1,3 +1,4 @@ +# language: zh-TW 功能: 加法 為了避免愚蠢的錯誤 作為一個數學白痴 examples/i18n/zh-TW/features/addition.feature @@ -1,3 +1,4 @@ +# language: zh-TW 功能: 除法 為了避免愚蠢的錯誤 收銀機必須要能夠計算除法 examples/i18n/zh-TW/features/division.feature @@ -11,5 +11,5 @@ When /^I press '(.*)'$/ do |name| end Then /^I should see '(.*)'$/ do |text| - response.should contain(/#{text}/m) + response_body.should contain(/#{text}/m) end examples/sinatra/features/step_definitions/add_steps.rb @@ -7,14 +7,22 @@ require app_file # Force the application name because polyglot breaks the auto-detection logic. Sinatra::Application.app_file = app_file -# RSpec require 'spec/expectations' -# Webrat require 'webrat' Webrat.configure do |config| - config.mode = :sinatra + config.mode = :rack end -World{Webrat::SinatraSession.new} -World(Webrat::Matchers, Webrat::HaveTagMatcher) +class MyWorld + include Webrat::Methods + include Webrat::Matchers + + Webrat::Methods.delegate_to_session :response_code, :response_body + + def app + Sinatra::Application + end +end + +World{MyWorld.new} examples/sinatra/features/support/env.rb @@ -154,6 +154,7 @@ Feature: Cucumber command line When I run cucumber -q --language no features Then it should pass with """ + # language: no Egenskap: Summering For å slippe å gjøre dumme feil Som en regnskapsfører features/cucumber_cli.feature @@ -21,7 +21,8 @@ Feature: --expand option Scenario: Expand the outline When I run cucumber -i -q --expand features/expand_me.feature - Then it should pass with + Then STDERR should be empty + And it should pass with """ Feature: submit guess features/expand.feature @@ -9,60 +9,3 @@ require 'cucumber/step_mother' require 'cucumber/cli/main' require 'cucumber/broadcaster' require 'cucumber/core_ext/exception' - -module Cucumber - KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but} - - class << self - # The currently active language - attr_reader :lang - - def load_language(lang) #:nodoc: - return if @lang - @lang = lang - alias_step_definitions(lang) - Parser.load_parser(keyword_hash) - end - - def language_incomplete?(lang=@lang) - KEYWORD_KEYS.detect{|key| keyword_hash(lang)[key].nil?} - end - - # File mode that accounts for Ruby platform and current language - def file_mode(m) - Cucumber::RUBY_1_9 ? "#{m}:#{keyword_hash['encoding']}" : m - end - - # Returns a Hash of the currently active - # language, or for a specific language if +lang+ is - # specified. - def keyword_hash(lang=@lang) - LANGUAGES[lang] - end - - def scenario_keyword - keyword_hash['scenario'].split('|')[0] + ':' - end - - def alias_step_definitions(lang) #:nodoc: - keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')} - alias_steps(keywords.flatten) - end - - # Sets up additional method aliases for Given, When and Then. - # This does *not* affect how feature files are parsed. If you - # want to create aliases in the parser, you have to do this in - # languages.yml. For example: - # - # and: And|With - def alias_steps(keywords) - keywords.each do |adverb| - StepMother.alias_adverb(adverb) - World.alias_adverb(adverb) - end - end - end - - # Make sure we always have English aliases - alias_step_definitions('en') -end \ No newline at end of file lib/cucumber.rb @@ -2,7 +2,7 @@ module Cucumber module Ast # Represents the root node of a parsed feature. class Feature - attr_accessor :file + attr_accessor :file, :language attr_writer :features attr_reader :name lib/cucumber/ast/feature.rb @@ -49,5 +49,9 @@ module Cucumber def accept_hook?(hook) @tags.accept_hook?(hook) || @feature.accept_hook?(hook) end + + def language + @feature.language + end end end lib/cucumber/ast/feature_element.rb @@ -69,7 +69,12 @@ module Cucumber end def visit_scenario_name(visitor, row) - visitor.visit_scenario_name(Cucumber.scenario_keyword, row.name, file_colon_line(row.line), source_indent(first_line_length)) + visitor.visit_scenario_name( + @feature.language.scenario_keyword, + row.name, + file_colon_line(row.line), + source_indent(first_line_length) + ) end def to_sexp lib/cucumber/ast/scenario_outline.rb @@ -74,6 +74,10 @@ module Cucumber @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil? end + def language + @feature_element.language + end + def dom_id @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_') end lib/cucumber/ast/step.rb @@ -88,7 +88,8 @@ module Cucumber end def actual_keyword - if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous + repeat_keywords = [language.but_keywords, language.and_keywords].flatten + if repeat_keywords.index(@step.keyword) && previous previous.actual_keyword else keyword @@ -123,6 +124,10 @@ module Cucumber @step.backtrace_line end + def language + @step.language + end + def to_sexp [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact end lib/cucumber/ast/step_invocation.rb @@ -4,13 +4,14 @@ module Cucumber class Configuration BUILTIN_FORMATS = { - 'html' => 'Cucumber::Formatter::Html', - 'pretty' => 'Cucumber::Formatter::Pretty', - 'profile' => 'Cucumber::Formatter::Profile', - 'progress' => 'Cucumber::Formatter::Progress', - 'rerun' => 'Cucumber::Formatter::Rerun', - 'usage' => 'Cucumber::Formatter::Usage', - 'junit' => 'Cucumber::Formatter::Junit' + 'html' => 'Cucumber::Formatter::Html', + 'pretty' => 'Cucumber::Formatter::Pretty', + 'profile' => 'Cucumber::Formatter::Profile', + 'progress' => 'Cucumber::Formatter::Progress', + 'rerun' => 'Cucumber::Formatter::Rerun', + 'usage' => 'Cucumber::Formatter::Usage', + 'junit' => 'Cucumber::Formatter::Junit', + 'tag_cloud' => 'Cucumber::Formatter::TagCloud' } DEFAULT_FORMAT = 'pretty' DRB_FLAG = '--drb' @@ -218,13 +219,13 @@ module Cucumber @drb end - def load_language - if Cucumber.language_incomplete?(@options[:lang]) - list_keywords_and_exit(@options[:lang]) - else - Cucumber.load_language(@options[:lang]) - end - end + # def load_language + # if Cucumber.language_incomplete?(@options[:lang]) + # list_keywords_and_exit(@options[:lang]) + # else + # Cucumber.load_language(@options[:lang]) + # end + # end def parse_tags(tag_string) tag_names = tag_string.split(",") @@ -384,6 +385,7 @@ Defined profiles in cucumber.yml: return @cucumber_yml end + # TODO: Move to Language def list_keywords_and_exit(lang) unless Cucumber::LANGUAGES[lang] raise("No language with key #{lang}") lib/cucumber/cli/configuration.rb @@ -2,6 +2,7 @@ require 'optparse' require 'cucumber' require 'ostruct' require 'cucumber/parser' +require 'cucumber/feature_file' require 'cucumber/formatter/color_io' require 'cucumber/cli/language_help_formatter' require 'cucumber/cli/configuration' @@ -41,13 +42,11 @@ module Cucumber configuration.parse!(@args) end end - configuration.load_language step_mother.options = configuration.options + features = load_plain_text_features require_files enable_diffing - - features = load_plain_text_features visitor = configuration.build_formatter_broadcaster(step_mother) step_mother.visitor = visitor # Needed to support World#announce @@ -63,11 +62,11 @@ module Cucumber def load_plain_text_features features = Ast::Features.new - parser = Parser::FeatureParser.new verbose_log("Features:") configuration.feature_files.each do |f| - feature = parser.parse_file(f, configuration.options) + feature_file = FeatureFile.new(f) + feature = feature_file.parse(configuration.options) if feature features.add_feature(feature) verbose_log(" * #{f}") lib/cucumber/cli/main.rb @@ -3,36 +3,4 @@ require 'cucumber/platform' require 'cucumber/ast' require 'cucumber/parser/treetop_ext' require 'cucumber/parser/table' - -module Cucumber - # Classes in this module parse feature files and translate the parse tree - # (concrete syntax tree) into an abstract syntax tree (AST) using - # <a href="http://martinfowler.com/dslwip/EmbeddedTranslation.html">Embedded translation</a>. - # - # The AST is built by the various <tt>#build</tt> methods in the parse tree. - # - # The AST classes are defined in the Cucumber::Ast module. - module Parser - def self.load_parser(keywords) - Loader.new(keywords) - end - - class Loader - def initialize(keywords) - @keywords = keywords - i18n_tt = File.expand_path(File.dirname(__FILE__) + '/parser/i18n.tt') - template = File.open(i18n_tt, Cucumber.file_mode('r')).read - erb = ERB.new(template) - grammar = erb.result(binding) - Treetop.load_from_string(grammar) - require 'cucumber/parser/feature' - end - - def keywords(key, raw=false) - return @keywords[key] if raw - values = @keywords[key].split('|') - values.map{|value| "'#{value}'"}.join(" / ") - end - end - end -end \ No newline at end of file +require 'cucumber/parser/feature' lib/cucumber/parser.rb @@ -10,17 +10,13 @@ module Cucumber include Treetop::Runtime def root - @root || :feature + @root || :feature_sub end - include I18n - - include Table - - module Feature0 + module FeatureSub0 end - module Feature1 + module FeatureSub1 def white elements[0] end @@ -55,7 +51,7 @@ module Cucumber end - module Feature2 + module FeatureSub2 def has_tags?(tag_names) tags.has_tags?(tag_names) end @@ -74,10 +70,10 @@ module Cucumber end end - def _nt_feature + def _nt_feature_sub start_index = index - if node_cache[:feature].has_key?(index) - cached = node_cache[:feature][index] + if node_cache[:feature_sub].has_key?(index) + cached = node_cache[:feature_sub][index] @index = cached.interval.end if cached return cached end @@ -139,7 +135,7 @@ module Cucumber end if s7.last r7 = instantiate_node(SyntaxNode,input, i7...index, s7) - r7.extend(Feature0) + r7.extend(FeatureSub0) else self.index = i7 r7 = nil @@ -181,14 +177,14 @@ module Cucumber end if s0.last r0 = instantiate_node(SyntaxNode,input, i0...index, s0) - r0.extend(Feature1) - r0.extend(Feature2) + r0.extend(FeatureSub1) + r0.extend(FeatureSub2) else self.index = i0 r0 = nil end - node_cache[:feature][start_index] = r0 + node_cache[:feature_sub][start_index] = r0 return r0 end @@ -1346,7 +1342,7 @@ module Cucumber module LinesToKeyword2 def build - self.text_value.split("\n").map{|s| s.strip }.join("\n") + self.text_value.split("\n").map{|s| s.strip}.join("\n") end end lib/cucumber/parser/feature.rb @@ -7,10 +7,8 @@ module Cucumber # Treetop will then generate the parser in-memory. When you're happy, just generate # the rb file with tt feature.tt grammar Feature - include I18n - include Table - rule feature + rule feature_sub white comment white lib/cucumber/parser/feature.tt @@ -1,35 +1,42 @@ module Cucumber module Parser - grammar I18n + module I18n + grammar <%= keywords('grammar_name', true) %> + include Feature + include Table - rule background_keyword - (<%= keywords('background') %>) ':' - end + rule feature + feature_sub + end - rule scenario_keyword - (<%= keywords('scenario') %>) ':' - end + rule background_keyword + (<%= keywords('background') %>) ':' + end - rule scenario_outline_keyword - (<%= keywords('scenario_outline') %>) ':' - end + rule scenario_keyword + (<%= keywords('scenario') %>) ':' + end - rule step_keyword - (<%= keywords('given') %>) / - (<%= keywords('when') %>) / - (<%= keywords('then') %>) / - (<%= keywords('and') %>) / - (<%= keywords('but') %>) - end + rule scenario_outline_keyword + (<%= keywords('scenario_outline') %>) ':' + end - rule keyword_space - <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %> - end + rule step_keyword + (<%= keywords('given') %>) / + (<%= keywords('when') %>) / + (<%= keywords('then') %>) / + (<%= keywords('and') %>) / + (<%= keywords('but') %>) + end - rule examples_keyword - (<%= keywords('examples') %>) ':'? - end + rule keyword_space + <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %> + end + rule examples_keyword + (<%= keywords('examples') %>) ':'? + end + end end end end \ No newline at end of file lib/cucumber/parser/i18n.tt @@ -12,78 +12,17 @@ end module Cucumber module Parser - class Filter - def initialize(lines, options) - @lines = lines - @include_tags = options[:include_tags] || [] - @exclude_tags = options[:exclude_tags] || [] - @name_regexps = options[:name_regexps] || [] - end - - def accept?(syntax_node) - at_line?(syntax_node) && - matches_tags?(syntax_node) && - matches_names?(syntax_node) - end - - def accept_example?(syntax_node, outline) - (at_line?(syntax_node) || outline_at_line?(outline)) && - (matches_names?(syntax_node) || outline_matches_names?(outline)) - end - - def at_line?(syntax_node) - @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)} - end - - def outline_at_line?(syntax_node) - @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.outline_at_line?(line)} - end - - def matches_tags?(syntax_node) - !excluded_by_tags?(syntax_node) && - included_by_tags?(syntax_node) - end - - def included_by_tags?(syntax_node) - @include_tags.empty? || syntax_node.has_tags?(@include_tags) - end - - def excluded_by_tags?(syntax_node) - @exclude_tags.any? && syntax_node.has_tags?(@exclude_tags) - end - - def outline_matches_names?(syntax_node) - @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.outline_matches_name?(name_regexp)} - end - - def matches_names?(syntax_node) - @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)} + class SyntaxError < StandardError + def initialize(parser, file, line_offset) + tf = parser.terminal_failures + expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}" + line = parser.failure_line + line_offset + message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}." + super(message) end end - - module TreetopExt - FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/ - - # Parses a file and returns a Cucumber::Ast - def parse_file(file, options) - _, path, lines = *FILE_COLON_LINE_PATTERN.match(file) - if path - lines = lines.split(':').map { |line| line.to_i } - else - path = file - end - filter = Filter.new(lines, options) - - loader = lambda { |io| parse_or_fail(io.read, filter, path) } - feature = if path =~ /^http/ - require 'open-uri' - open(path, &loader) - else - File.open(path, Cucumber.file_mode('r'), &loader) - end - feature - end - + + module TreetopExt def parse_or_fail(string, filter=nil, file=nil, line_offset=0) parse_tree = parse(string) if parse_tree.nil? @@ -95,16 +34,6 @@ module Cucumber end end end - - class SyntaxError < StandardError - def initialize(parser, file, line_offset) - tf = parser.terminal_failures - expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}" - line = parser.failure_line + line_offset - message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}." - super(message) - end - end end end @@ -115,7 +44,7 @@ module Treetop input.line_of(interval.first) end end - + class CompiledParser include Cucumber::Parser::TreetopExt end lib/cucumber/parser/treetop_ext.rb @@ -4,6 +4,7 @@ require 'rbconfig' require 'yaml' module Cucumber + # TODO: Move these constants and the file to Language. Update wiki 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') @@ -15,4 +16,8 @@ module Cucumber RAILS = defined?(Rails) RUBY_BINARY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) RUBY_1_9 = RUBY_VERSION =~ /^1\.9/ + + def self.file_mode(m) + RUBY_1_9 ? "#{m}:UTF-8" : m + end end \ No newline at end of file lib/cucumber/platform.rb @@ -3,7 +3,7 @@ module Cucumber #:nodoc: MAJOR = 0 MINOR = 3 TINY = 11 - PATCH = 3 # Set to nil for official release + PATCH = 4 # Set to nil for official release STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.') end lib/cucumber/version.rb @@ -4,10 +4,11 @@ module Cucumber module Ast describe StepCollection do it "should convert And to Given in snippets" do - c = StepCollection.new([ - Step.new(1, 'Given', 'cukes'), - Step.new(2, 'And', 'turnips') - ]) + s1 = Step.new(1, 'Given', 'cukes') + s2 = Step.new(2, 'And', 'turnips') + s1.stub!(:language).and_return(Parser::I18n::Language['en']) + s2.stub!(:language).and_return(Parser::I18n::Language['en']) + c = StepCollection.new([s1, s2]) actual_keywords = c.step_invocations.map{|i| i.actual_keyword} actual_keywords.should == %w{Given Given} end spec/cucumber/ast/step_collection_spec.rb @@ -35,7 +35,7 @@ module Cucumber @cli = Main.new(%w{--verbose example.feature}, @out) @cli.stub!(:require) - Parser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_file => @empty_feature)) + FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature)) @cli.execute!(Object.new.extend(StepMother)) @@ -134,15 +134,8 @@ module Cucumber @configuration.should_receive(:parse!).exactly(:twice) @cli.execute!(@step_mother) end - - it "proceeds with the execution locally" do - @configuration.should_receive(:load_language) - @cli.execute!(@step_mother) - end end - end - end end end spec/cucumber/cli/main_spec.rb @@ -1,11 +1,12 @@ require File.dirname(__FILE__) + '/../../spec_helper' -require 'cucumber/parser' +require 'cucumber/parser/i18n/language' module Cucumber module Parser describe Feature do before do - @parser = FeatureParser.new + @language = I18n::Language['en'] + @parser = @language.parser end def parse(text) @@ -13,11 +14,11 @@ module Cucumber end def parse_file(file) - @parser.parse_file(File.dirname(__FILE__) + "/../treetop_parser/" + file, {}) + @language.parse_file(File.dirname(__FILE__) + "/../treetop_parser/" + file, Filter.new([], {})) end def parse_example_file(file) - @parser.parse_file(File.dirname(__FILE__) + "/../../../examples/" + file, {}) + @language.parse_file(File.dirname(__FILE__) + "/../../../examples/" + file, Filter.new([], {})) end describe "Comments" do @@ -352,7 +353,8 @@ Given I am a step describe "Filtering" do it "should filter outline tables" do - f = parse_example_file('self_test/features/outline_sample.feature:12') + ff = FeatureFile.new(File.dirname(__FILE__) + '/../../../examples/self_test/features/outline_sample.feature:12') + f = ff.parse({:lang => 'en'}) f.to_sexp.should == [:feature, "./spec/cucumber/parser/../../../examples/self_test/features/outline_sample.feature", spec/cucumber/parser/feature_parser_spec.rb @@ -6,7 +6,7 @@ module Cucumber module Parser describe 'Tables' do before do - @parser = FeatureParser.new + @parser = I18n::EnglishParser.new end def parse(text) spec/cucumber/parser/table_parser_spec.rb @@ -6,7 +6,6 @@ require 'spec/autorun' ENV['CUCUMBER_COLORS']=nil $:.unshift(File.dirname(__FILE__) + '/../lib') require 'cucumber' -Cucumber.load_language('en') $:.unshift(File.dirname(__FILE__)) ::Term::ANSIColor.coloring = true spec/spec_helper.rb d282c602b1e9658eda6fdb8f471460b37b13475f Aslak Hellesøy aslak.hellesoy@gmail.com http://github.com/garnierjm/cucumber/commit/5435f225dd6c78c696cdacbf161cc010749733eb 5435f225dd6c78c696cdacbf161cc010749733eb 2009-06-15T11:16:19-07:00 2009-06-15T11:15:30-07:00 Possibility to specify scenario language as part of the .feature file [#345 state:resolved] 6cb071fad1816ee45ca7c72ad950c8d1cf2571b5 Aslak Hellesøy aslak.hellesoy@gmail.com