Skip to content

Commit d253b9b

Browse files
authored
Merge pull request #574 from seleniumbase/translations-and-refactoring
Add, update, and refactor translations
2 parents 026e345 + 48007a0 commit d253b9b

File tree

8 files changed

+373
-84
lines changed

8 files changed

+373
-84
lines changed

seleniumbase/fixtures/base_case.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2214,10 +2214,6 @@ def ad_block(self):
22142214
except Exception:
22152215
pass # Don't fail test if ad_blocking fails
22162216

2217-
def block_ads(self):
2218-
""" Same as ad_block() """
2219-
self.ad_block()
2220-
22212217
def get_domain_url(self, url):
22222218
return page_utils.get_domain_url(url)
22232219

@@ -2965,10 +2961,15 @@ def assert_element_not_present(self, selector, by=By.CSS_SELECTOR,
29652961
return True
29662962

29672963
def wait(self, seconds):
2968-
""" Same as sleep() - Some JS frameworks use this method name. """
2964+
""" Same as self.sleep() - Some JS frameworks use this method name. """
29692965
self.sleep(seconds)
29702966

2967+
def block_ads(self):
2968+
""" Same as self.ad_block() """
2969+
self.ad_block()
2970+
29712971
def _print(self, msg):
2972+
""" Same as Python's print() """
29722973
print(msg)
29732974

29742975
def start_tour(self, name=None, interval=0):

seleniumbase/plugins/pytest_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def pytest_addoption(parser):
324324
default=False,
325325
help="""The option to check for JavaScript errors after
326326
every page load.""")
327-
parser.addoption('--ad_block', '--ad-block',
327+
parser.addoption('--ad_block', '--ad-block', '--block_ads', '--block-ads',
328328
action="store_true",
329329
dest='ad_block_on',
330330
default=False,

seleniumbase/plugins/selenium_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def options(self, parser, env):
234234
help="""The option to check for JavaScript errors after
235235
every page load.""")
236236
parser.add_option(
237-
'--ad_block', '--ad-block',
237+
'--ad_block', '--ad-block', '--block_ads', '--block-ads',
238238
action="store_true",
239239
dest='ad_block_on',
240240
default=False,

seleniumbase/translate/french.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def annonces_de_bloc(self, *args, **kwargs):
181181
# ad_block()
182182
return self.ad_block(*args, **kwargs)
183183

184-
def passer(self, *args, **kwargs):
184+
def sauter(self, *args, **kwargs):
185185
# skip(reason="")
186186
return self.skip(*args, **kwargs)
187187

seleniumbase/translate/master_dict.py

Lines changed: 359 additions & 71 deletions
Large diffs are not rendered by default.

seleniumbase/translate/portuguese.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def bloquear_anúncios(self, *args, **kwargs):
181181
# ad_block()
182182
return self.ad_block(*args, **kwargs)
183183

184-
def omitir(self, *args, **kwargs):
184+
def saltar(self, *args, **kwargs):
185185
# skip(reason="")
186186
return self.skip(*args, **kwargs)
187187

@@ -197,7 +197,7 @@ def mudar_para_o_quadro(self, *args, **kwargs):
197197
# switch_to_frame(frame)
198198
return self.switch_to_frame(*args, **kwargs)
199199

200-
def volte_para_o_conteúdo_padrão(self, *args, **kwargs):
200+
def mudar_para_o_conteúdo_padrão(self, *args, **kwargs):
201201
# switch_to_default_content()
202202
return self.switch_to_default_content(*args, **kwargs)
203203

@@ -209,7 +209,7 @@ def mudar_para_janela(self, *args, **kwargs):
209209
# switch_to_window(window)
210210
return self.switch_to_window(*args, **kwargs)
211211

212-
def volte_para_a_janela_padrão(self, *args, **kwargs):
212+
def mudar_para_a_janela_padrão(self, *args, **kwargs):
213213
# switch_to_default_window()
214214
return self.switch_to_default_window(*args, **kwargs)
215215

seleniumbase/translate/spanish.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def bloquear_anuncios(self, *args, **kwargs):
181181
# ad_block()
182182
return self.ad_block(*args, **kwargs)
183183

184-
def omitir(self, *args, **kwargs):
184+
def saltar(self, *args, **kwargs):
185185
# skip(reason="")
186186
return self.skip(*args, **kwargs)
187187

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
setup(
5656
name='seleniumbase',
57-
version='1.38.3',
57+
version='1.38.4',
5858
description='Fast, Easy, and Reliable Browser Automation & Testing.',
5959
long_description=long_description,
6060
long_description_content_type='text/markdown',

0 commit comments

Comments
 (0)