Skip to content

Commit 6e4cc7f

Browse files
authored
[qacode] fix for issue #256 (#257)
* [qacode] fix for issue #256 + delete control_group + delete tests for control_group + update CHANGELOG + USAGE * [qacode] add tests to logger_manager
1 parent df49658 commit 6e4cc7f

File tree

11 files changed

+22
-296
lines changed

11 files changed

+22
-296
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2424
- Now get_tag update self property
2525

2626
### Removed
27-
27+
- Deleted ControlGroup + tests #256
2828

2929
## [v0.6.0] - 2019-03-18
3030

USAGE.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ ControlForm
152152
+ method **dropdown_deselect** : The Select class only works with tags which have select tags
153153
+ method **dropdown_deselect_all** : The Select class only works with tags which have select tags with multiple="multiple" attribute.
154154

155-
ControlGroup
156-
~~~~~~~~~~~~
157-
158-
+ Param **on_instance_group** : by default it's disabled, at enable raises when strict_rules type warning logs message with 'hight severity' or when type error log messages with 'medium or more severity'
159-
+ Param **group** : allow to track all ControlBase elements using `elements` (*instances of WebElement*) and `group` (*instances of ControlBase*) properties
160-
161155
Pages
162156
-----
163157

qacode/configs/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
{ "name": "lst_ordered", "selector": "ol:nth-child(1)"},
8383
{ "name": "lst_ordered_child", "selector": "li"},
8484
{ "name": "dd_menu_data", "selector": "#ddData"},
85-
{ "name": "dd_menu_data_lists", "selector": "a[href='/qacode/data/lists']"}
85+
{ "name": "dd_menu_data_lists", "selector": "a[href='/qacode/data/lists']"},
86+
{ "name": "tbl_ok", "selector": "#tblOk"},
87+
{ "name": "tbl_html5_ok", "selector": "#tblHtml5Ok"}
8688
]
8789
},
8890
{ "name": "qacode_inputs",

qacode/core/webs/controls/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from qacode.core.webs.controls import control_base
66
from qacode.core.webs.controls import control_form
7-
from qacode.core.webs.controls import control_group
87

98

10-
__all__ = ['control_base', 'control_form', 'control_group']
9+
__all__ = ['control_base', 'control_form']

qacode/core/webs/controls/control_group.py

Lines changed: 0 additions & 107 deletions
This file was deleted.

qacode/core/webs/pages/page_base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from qacode.core.exceptions.page_exception import PageException
88
from qacode.core.webs.controls.control_base import ControlBase
99
from qacode.core.webs.controls.control_form import ControlForm
10-
from qacode.core.webs.controls.control_group import ControlGroup
1110

1211
from selenium.webdriver.common.by import By
1312

@@ -97,7 +96,6 @@ def _load(self, settings=None):
9796
control = {
9897
'ControlBase': ControlBase,
9998
'ControlForm': ControlForm,
100-
'ControlGroup': ControlGroup,
10199
}[instance](self.bot, **cfg_control)
102100
except KeyError:
103101
self.log.debug(("Bad instance name selected for "
@@ -152,7 +150,7 @@ def get_elements(self, config_controls):
152150
instance = config_control.get("instance")
153151
control = None
154152
try:
155-
control_types = (ControlBase, ControlForm, ControlGroup)
153+
control_types = (ControlBase, ControlForm)
156154
if isinstance(instance, control_types):
157155
controls.append(control)
158156
else:

source-docs/source/controls.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,3 @@ Class: ControlForm
1818
:show-inheritance:
1919
.. autoclass:: qacode.core.webs.controls.control_form.ControlForm
2020
:members:
21-
22-
Class: ControlGroup
23-
-------------------
24-
.. automodule:: qacode.core.webs.controls.control_group
25-
:members:
26-
:undoc-members:
27-
:show-inheritance:
28-
.. autoclass:: qacode.core.webs.controls.control_group.ControlGroup
29-
:members:

tests/000_unitaries/suite_001_config.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ def test_config_tests_keys(self, key_name):
9292
key_value.get('web_controls').get('control_base'), bool)
9393
self.assert_is_instance(
9494
key_value.get('web_controls').get('control_form'), bool)
95-
self.assert_is_instance(
96-
key_value.get('web_controls').get('control_group'), bool)
9795
self.assert_is_instance(
9896
key_value.get('web_pages'), bool)
9997
self.assert_is_instance(

tests/000_unitaries/suite_002_testinfobase.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import logging
66
import pytest
7+
from qacode.core.loggers.logger_manager import LoggerManager
78
from qacode.core.testing.test_info import TestInfoBase
89
from qatestlink.core.testlink_manager import TLManager
910
from qautils.files import settings
@@ -43,3 +44,18 @@ def test_002_log_levels(self, log_level):
4344
self.log.error(msg)
4445
if log_level == 'CRITICAL':
4546
self.log.critical(msg)
47+
48+
def test_loggermanager_notlogpath(self):
49+
"""Testcase: test_loggermanager_notlogpath"""
50+
with pytest.raises(Exception):
51+
LoggerManager(log_path=None)
52+
53+
def test_loggermanager_notlogname(self):
54+
"""Testcase: test_loggermanager_notlogname"""
55+
with pytest.raises(Exception):
56+
LoggerManager(log_name=None)
57+
58+
def test_loggermanager_allflagsfalse(self):
59+
"""Testcase: test_loggermanager_allflagsfalse"""
60+
with pytest.raises(Exception):
61+
LoggerManager(is_output_console=False, is_output_file=False)

tests/001_functionals/suite_007_controlgroup.py

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)