Skip to content

Commit 3ce7544

Browse files
authored
Fix language BDD keywords API (#429)
1 parent 3402437 commit 3ce7544

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

docs/releasenotes/3.3.1.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Robotidy 3.3.1
22
=========================================
3-
Fix release for RenameKeyword variable matching improvements.
3+
Fix release for breaking changes in RF 6.0 language API and RenameKeyword variable matching improvements.
44

55
You can install the latest available version by running::
66

@@ -10,6 +10,11 @@ or to install exactly this version::
1010

1111
pip install robotframework-tidy==3.3.1
1212

13+
Fix Translate BDD keywords
14+
---------------------------
15+
Final release of the Robot Framework 6.0 modified the language API.
16+
This change will breaks the Robotidy with RF 6.0 when using ``Translate`` transformer with
17+
`translate_bdd`` set to ``True``. This release fixes it.
1318

1419
Do not rename variables in RenameKeyword (#417)
1520
------------------------------------------------

robotidy/transformers/Translate.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ def bdd_mapping(self):
8383
if self._bdd_mapping is None:
8484
self._bdd_mapping = {}
8585
for language in self.languages:
86-
self._bdd_mapping.update({name.title(): "But" for name in language.but_prefix})
87-
self._bdd_mapping.update({name.title(): "Given" for name in language.given_prefix})
88-
self._bdd_mapping.update({name.title(): "And" for name in language.and_prefix})
89-
self._bdd_mapping.update({name.title(): "Then" for name in language.then_prefix})
90-
self._bdd_mapping.update({name.title(): "When" for name in language.when_prefix})
86+
self._bdd_mapping.update({name.title(): "But" for name in language.but_prefixes})
87+
self._bdd_mapping.update({name.title(): "Given" for name in language.given_prefixes})
88+
self._bdd_mapping.update({name.title(): "And" for name in language.and_prefixes})
89+
self._bdd_mapping.update({name.title(): "Then" for name in language.then_prefixes})
90+
self._bdd_mapping.update({name.title(): "When" for name in language.when_prefixes})
9191
return self._bdd_mapping
9292

9393
def get_bdd_keyword(self, container: Set, alternative: Optional[str], param_name: str) -> str:
@@ -114,11 +114,11 @@ def get_translated_bdd(
114114
if not self.translate_bdd:
115115
return {}
116116
return {
117-
"But": self.get_bdd_keyword(self.language.but_prefix, but_alternative, "but_alternative"),
118-
"Given": self.get_bdd_keyword(self.language.given_prefix, given_alternative, "given_alternative"),
119-
"And": self.get_bdd_keyword(self.language.and_prefix, and_alternative, "and_alternative"),
120-
"Then": self.get_bdd_keyword(self.language.then_prefix, then_alternative, "then_alternative"),
121-
"When": self.get_bdd_keyword(self.language.when_prefix, when_alternative, "when_alternative"),
117+
"But": self.get_bdd_keyword(self.language.but_prefixes, but_alternative, "but_alternative"),
118+
"Given": self.get_bdd_keyword(self.language.given_prefixes, given_alternative, "given_alternative"),
119+
"And": self.get_bdd_keyword(self.language.and_prefixes, and_alternative, "and_alternative"),
120+
"Then": self.get_bdd_keyword(self.language.then_prefixes, then_alternative, "then_alternative"),
121+
"When": self.get_bdd_keyword(self.language.when_prefixes, when_alternative, "when_alternative"),
122122
}
123123

124124
def add_replace_language_header(self, node):

tests/atest/transformers/Translate/expected/de.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Dokumentation This is doc
44

55
Suitenachbereitung Keyword
66

7-
Aufgaben Marker tag
7+
Aufgabenmarker tag
88

99

1010
*** Variablen ***
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
robotframework==6.0rc2
1+
robotframework==6.0

0 commit comments

Comments
 (0)