Merge pull request #118 from tataronrails/master

[fix] Placeholder and StepDefinition for the possibility to use the Russian language
jnicklas · Apr 4, 2014 · 89351fb · 89351fb
2 parents 0c7aa5f + ed44685
commit 89351fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/turnip/placeholder.rb b/lib/turnip/placeholder.rb
@@ -27,7 +27,7 @@ def placeholders
 
       def default
         @default ||= new(:default) do
-          match %r((?:"([^"]*)"|'([^']*)'|([a-zA-Z0-9_-]+))) do |first, second, third|
+          match %r((?:"([^"]*)"|'([^']*)'|([[:alnum:]_-]+))) do |first, second, third|
             first or second or third
           end
         end

diff --git a/lib/turnip/step_definition.rb b/lib/turnip/step_definition.rb
@@ -38,7 +38,7 @@ def match(description)
 
     OPTIONAL_WORD_REGEXP = /(\\\s)?\\\(([^)]+)\\\)(\\\s)?/
     PLACEHOLDER_REGEXP = /:([\w]+)/
-    ALTERNATIVE_WORD_REGEXP = /(\w+)((\/\w+)+)/
+    ALTERNATIVE_WORD_REGEXP = /([[:alpha:]]+)((\/[[:alpha:]]+)+)/
 
     def compile_regexp
       @placeholder_names = []