fix tests

Author: skarimo

.generator/conftest.py

@@ -20,10 +20,7 @@
 
 
 MODIFIED_FEATURES = {pathlib.Path(p).resolve() for p in os.getenv("BDD_MODIFIED_FEATURES", "").split(" ") if p}
-
 ROOT_PATH = pathlib.Path(__file__).parent.parent
-
-
 PATTERN_ALPHANUM = re.compile(r"[^A-Za-z0-9]+")
 
 

.generator/src/generator/formatter.py

@@ -5,49 +5,8 @@
 from functools import singledispatch
 
 
-KEYWORDS = {
-    "__FILE__",
-    "and",
-    "def",
-    "end",
-    "in",
-    "or",
-    "self",
-    "unless",
-    "__LINE__",
-    "begin",
-    "defined?",
-    "ensure",
-    "module",
-    "redo",
-    "super",
-    "until",
-    "BEGIN",
-    "break",
-    "do",
-    "false",
-    "next",
-    "rescue",
-    "then",
-    "when",
-    "END",
-    "case",
-    "else",
-    "for",
-    "nil",
-    "retry",
-    "true",
-    "while",
-    "alias",
-    "class",
-    "elsif",
-    "if",
-    "not",
-    "return",
-    "undef",
-    "yield",
-    "hash",
-}
+with (pathlib.Path(__file__).parent / "keywords.json").open() as f:
+    KEYWORDS = json.load(f)
 
 with (pathlib.Path(__file__).parent / "replacement.json").open() as f:
     EDGE_CASES = json.load(f)

.generator/src/generator/keywords.json

@@ -0,0 +1,43 @@
+[
+    "__FILE__",
+    "and",
+    "def",
+    "end",
+    "in",
+    "or",
+    "self",
+    "unless",
+    "__LINE__",
+    "begin",
+    "defined?",
+    "ensure",
+    "module",
+    "redo",
+    "super",
+    "until",
+    "BEGIN",
+    "break",
+    "do",
+    "false",
+    "next",
+    "rescue",
+    "then",
+    "when",
+    "END",
+    "case",
+    "else",
+    "for",
+    "nil",
+    "retry",
+    "true",
+    "while",
+    "alias",
+    "class",
+    "elsif",
+    "if",
+    "not",
+    "return",
+    "undef",
+    "yield",
+    "hash"
+]

features/support/templating.rb

@@ -1,5 +1,6 @@
 require 'json'
 
+KEYWORDS = JSON.parse(File.read(File.join(__dir__, "..", "..", ".generator", "src", "generator", "keywords.json")))
 EDGE_CASES = JSON.parse(File.read(File.join(__dir__, "..", "..", ".generator", "src", "generator", "replacement.json")))
 REPLACED_KEYS = EDGE_CASES.keys.map { |k| Regexp.quote(k) }.join("|")
 
@@ -20,7 +21,9 @@ def lookup(dotted_path)
           when Hash
             result = result.include?(part.to_sym) ? result[part.to_sym] : result[part]
           else
-            result = result.send(part.snakecase)
+            s = part.snakecase
+            s = "_#{s}" if KEYWORDS.include? s
+            result = result.send(s)
           end
         end
       end