Skip to content

Commit a4f8b05

Browse files
committed
[qacode] more #143 fixes
1 parent ab81547 commit a4f8b05

File tree

2 files changed

+6
-31
lines changed

2 files changed

+6
-31
lines changed

qacode/core/webs/controls/control_base.py

+6-15
Original file line numberDiff line numberDiff line change
@@ -408,17 +408,12 @@ def __repr__(self):
408408
"""Show basic properties for this object"""
409409
return ("{}: name={}, "
410410
"bot.browser={}, bot.mode={} \n"
411-
"settings={} \n"
412-
"is_displayed={}, "
413-
"is_enabled={}, is_selected={}").format(
411+
"settings={}").format(
414412
self.__class__.__name__,
415413
self.name,
416414
self.bot.settings.get('browser'),
417415
self.bot.settings.get('mode'),
418-
self.settings,
419-
self.is_displayed,
420-
self.is_enabled,
421-
self.is_selected)
416+
self.settings)
422417

423418
@property
424419
def bot(self):
@@ -511,23 +506,19 @@ def tag(self):
511506
@property
512507
def text(self):
513508
"""GET for element text attribute"""
514-
self.__check_element_ready__()
515-
return self._browser.elements.get_text(self._element)
509+
return self._text
516510

517511
@property
518512
def is_displayed(self):
519513
"""TODO: doc method"""
520-
self.__check_element_ready__()
521-
return self.bot.navigation.ele_is_displayed(self.element)
514+
return self.bot.navigation.ele_is_displayed(self.element) or None
522515

523516
@property
524517
def is_enabled(self):
525518
"""TODO: doc method"""
526-
self.__check_element_ready__()
527-
return self.bot.navigation.ele_is_enabled(self.element)
519+
return self.bot.navigation.ele_is_enabled(self.element) or None
528520

529521
@property
530522
def is_selected(self):
531523
"""TODO: doc method"""
532-
self.__check_element_ready__()
533-
return self.bot.navigation.ele_is_selected(self.element)
524+
return self.bot.navigation.ele_is_selected(self.element) or None

tests/001_functionals/suite_005_controlbase.py

-16
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,6 @@ def test_method_gettext(self):
157157
control = ControlBase(self.bot, **cfg_btn)
158158
ASSERT.equals(control.get_text(), 'Login')
159159

160-
@pytest.mark.skipIf(SKIP_CONTROLS, SKIP_CONTROLS_MSG)
161-
def test_property_attr_id(self):
162-
"""Testcase: test_property_attr_id"""
163-
cfg_input = self.txt_username.copy()
164-
cfg_input.update({"on_instance_search": True})
165-
control = ControlBase(self.bot, **cfg_input)
166-
ASSERT.not_none(control.attr_id)
167-
168-
@pytest.mark.skipIf(SKIP_CONTROLS, SKIP_CONTROLS_MSG)
169-
def test_property_attr_class(self):
170-
"""Testcase: test_property_attr_class"""
171-
cfg_form = self.form_login.copy()
172-
cfg_form.update({"on_instance_search": True})
173-
control = ControlBase(self.bot, **cfg_form)
174-
ASSERT.in_list('ember-view', control.attr_class)
175-
176160
@pytest.mark.skipIf(SKIP_CONTROLS, SKIP_CONTROLS_MSG)
177161
def test_method_getattrvalue(self):
178162
"""Testcase: test_method_getattrvalue"""

0 commit comments

Comments
 (0)