WIP, refactoring all library

.gitignore

@@ -103,9 +103,11 @@ ENV/
 
 # QACODE ignores
 qacode/configs/settings.json
-tests/reports/*
-tests/reports/coverage/*
-tests/reports/benchmarks/benchmark.*.svg
+qacode_old/configs/settings.json
+
+tests_old/reports/*
+tests_old/reports/coverage/*
+tests_old/reports/benchmarks/benchmark.*.svg
 # Visual Studio
 .vs/
 # Visual code

MANIFEST.in

@@ -1,20 +1,20 @@
-include *.in
-include *.md
-include *.pyproj
-include *.rst
-include *.yml
-include LICENSE
-include pytest.ini
-include tox.ini
-include conftest.py
-include requirements*.txt
-recursive-include logs *.gitkeep
-recursive-include qacode *.json
-recursive-include tests *.py
-recursive-include source-docs *.rst
-recursive-include source-docs *.py
-recursive-include source-docs *.yml
-recursive-include source-docs *.bat
-recursive-include source-docs Makefile
-recursive-include .github *.md
-recursive-include .circleci *.yml
+include *.in
+include *.md
+include *.py
+include *.rst
+include *.txt
+include *.yml
+include .circleci/config.yml
+include source-docs/Makefile
+include source-docs/make.bat
+include pytest.ini
+include tox.ini
+recursive-include docs *.gitkeep
+recursive-include logs *.gitkeep
+recursive-include qacode *.json
+recursive-include qacode *.py
+recursive-include tests *.py
+recursive-include tests *.xml
+recursive-include source-docs *.rst
+recursive-include source-docs *.py
+exclude tests/reports/coverage.xml

README.rst

@@ -122,8 +122,8 @@ Getting Started
 
 
     SETTINGS = settings(
-        file_path="/home/user/config/dir/",
-        file_name="settings.json"
+        path="/home/user/config/dir/",
+        name="settings.json"
     )
 
 

conftest.py

@@ -3,22 +3,32 @@
 
 import pytest
 import sys
-from qacode.core.bots.bot_base import BotBase
+from qacode.core.bots.bot import Bot
 from qacode.utils import settings
 
 
 sys.dont_write_bytecode = True
 
 
 @pytest.fixture(scope="session")
-def browser():
-    CFG = settings(file_path="qacode/configs/", file_name="settings.json")
-    bot = None
+def bot():
+    CFG = settings(path="qacode/configs/", name="settings.json")
+    bot = Bot(**CFG)
     try:
-        bot = BotBase(**CFG)
         yield bot
     except Exception as err:
         raise err
+
+
+@pytest.fixture(scope="session")
+def browser():
+    CFG = settings(path="qacode/configs/", name="settings.json")
+    bot = Bot(**CFG)
+    try:
+        yield bot.browser_create(bot.config.browsers[0])
+    except Exception as err:
+        raise err
     finally:
-        if bot:
-            bot.close()
+        if bot.browsers[0].driver is not None:
+            bot.browsers[0].close()
+        # else: useless browser, never opened

qacode/configs/settings.json

@@ -1,29 +1,47 @@
-{ "bot": {
-    "log_output_file": "logs/",
-    "log_name": "qacode",
-    "log_level": "INFO",
-    "mode": "remote",
-    "browser": "chrome",
-    "options": { "headless": false },
-    "url_hub": "http://netzulo.tk:11000/wd/hub",
+{
+  "log":{
+    "path": "logs/", "name": "qacode", "level": "INFO"
+  },
+  "bot":{
+    "hub_url": "http://146.255.103.8:11000/wd/hub",
     "drivers_path": "../qadrivers",
-    "drivers_names": [
-      "chromedriver_32.exe",
-      "chromedriver_64.exe",
-      "chromedriver_32",
-      "chromedriver_64",
-      "firefoxdriver_32.exe",
-      "firefoxdriver_64.exe",
-      "firefoxdriver_64",
-      "firefoxdriver_32",
-      "iexplorerdriver_32.exe",
-      "iexplorerdriver_64.exe",
-      "edgedriver_32.exe",
-      "edgedriver_64.exe",
-      "operadriver_32.exe",
-      "operadriver_64.exe",
-      "operadriver_32",
-      "operadriver_64"
+    "drivers_names": {
+      "chrome": "chromedriver_64.exe",
+      "firefox": "firefoxdriver_64.exe",
+      "opera": "operadriver_64.exe",
+      "iexplorer": "iexplorerdriver_64.exe",
+      "edge": "edgedriver_64.exe"
+    },
+    "browsers": [
+      {"browser": "chrome", "mode": "remote", "options": {"headless": false}},
+      {"browser": "chrome", "mode": "local", "options": {"headless": false}}
+    ],
+    "pages": [
+      {"name": "login", "url": "http://146.255.103.8:83/qacode/login"},
+      {"name": "logout", "url": "http://146.255.103.8:83/qacode/logout"},
+      {"name": "inputs", "url": "http://146.255.103.8:83/qacode/forms/inputs"},
+      {"name": "lists", "url": "http://146.255.103.8:83/qacode/data/lists"}
+    ],
+    "controls": [
+      { "name": "form", "selector": "#frmLogin", "pages": ["login"]},
+      { "name": "username", "selector": "#txtUsername-field", "pages": ["login"]},
+      { "name": "password", "selector": "#txtPassword-field", "pages": ["login"]},
+      { "name": "submit", "selector": "#btnLogin", "pages": ["login"]},
+      { "name": "btn_logout", "selector": "a[href='/qacode/logout']", "pages": ["logout"]},
+      { "name": "btn_login", "selector": "a[href='/qacode/login']", "pages": ["logout"]},
+      { "name": "title_buttons", "selector": "#titleButtons", "pages": ["inputs"]},
+      { "name": "btn_invisible", "selector": "#btnInvisibleAtTimeout", "pages": ["inputs"]},
+      { "name": "btn_visible", "selector": "#btnVisibleAtTimeout", "pages": ["inputs"]},
+      { "name": "input_text", "selector": "#txtTest001", "pages": ["inputs"]},
+      { "name": "dd_base", "selector": "#txtTest002", "pages": ["inputs"]},
+      { "name": "dd_multiple", "selector": "#txtTest003", "pages": ["inputs"]},
+      { "name": "lst_ordered", "selector": "ol:nth-child(1)", "pages": ["lists"]},
+      { "name": "lst_ordered_child", "selector": "li", "pages": ["lists"]},
+      { "name": "dd_menu_data", "selector": "#ddData", "pages": ["lists"]},
+      { "name": "dd_menu_data_lists", "selector": "a[href='/qacode/data/lists']", "pages": ["lists"]},
+      { "name": "tbl_ok", "selector": "#tblOk", "pages": ["lists"]},
+      { "name": "tbl_html5_ok", "selector": "#tblHtml5Ok", "pages": ["lists"]},
+      { "name": "tbl_html_tbodies_ok", "selector": "#tblHtml5OkTbodies", "pages": ["lists"]}
     ]
   },
   "testlink": {
@@ -34,96 +52,5 @@
     },
     "dev_key": "1bfd2ef4ceda22b482b12f2b25457495",
     "log_level":"INFO"
-  },
-  "tests": {
-    "skip":{
-      "test_configs": true,
-      "browsers": {
-        "chrome": {"local":true, "remote":false},
-        "firefox": {"local":true, "remote":true},
-        "iexplorer": {"local":true, "remote":true},
-        "edge": {"local":true, "remote":true},
-        "opera": {"local":true, "remote":false}
-      },
-      "bot_multiple": false,
-      "bot_unique": false,
-      "bot_navigations": false,
-      "web_controls": {
-        "control_base": false,
-        "control_form": false,
-        "control_dropdown": false,
-        "control_table": false
-      },
-      "web_pages": false,
-      "benchmarks": true
-    },
-    "apps": [
-      { "name": "qadmin",
-        "pages": [
-          { "name": "qacode_login",
-            "url": "http://netzulo.tk:83/qacode/login",
-            "locator": "css selector",
-            "go_url": false,
-            "wait_url": 0,
-            "maximize": false,
-            "controls": [
-              { "name": "form_login", "selector": "#frmLogin", "on_instance_search": true, "on_instance_load": false },
-              { "name": "txt_username", "selector": "#txtUsername-field", "on_instance_search": true, "on_instance_load": false },
-              { "name": "txt_password", "selector": "#txtPassword-field", "on_instance_search": true, "on_instance_load": false },
-              { "name": "btn_submit", "selector": "#btnLogin", "on_instance_search": true, "on_instance_load": false }
-            ]
-          },
-          { "name": "qacode_lists",
-            "url": "http://netzulo.tk:83/qacode/data/lists",
-            "locator": "css selector",
-            "go_url": false,
-            "wait_url": 0,
-            "maximize": false,
-            "controls": [
-              { "name": "lst_ordered", "selector": "ol:nth-child(1)"},
-              { "name": "lst_ordered_child", "selector": "li"},
-              { "name": "dd_menu_data", "selector": "#ddData"},
-              { "name": "dd_menu_data_lists", "selector": "a[href='/qacode/data/lists']"},
-              { "name": "tbl_ok", "selector": "#tblOk"},
-              { "name": "tbl_html5_ok", "selector": "#tblHtml5Ok"},
-              { "name": "tbl_html_tbodies_ok", "selector": "#tblHtml5OkTbodies"}
-            ]
-          },
-          { "name": "qacode_inputs",
-            "url": "http://netzulo.tk:83/qacode/forms/inputs",
-            "locator": "css selector",
-            "go_url": false,
-            "wait_url": 0,
-            "maximize": false,
-            "controls": [
-              { "name": "dd_base", "selector": "#txtTest002", "instance": "ControlForm",
-                "strict_rules": [
-                  { "tag": "select", "type": "tag", "severity": "hight" }
-                ]
-              },
-              { "name": "dd_multiple", "selector": "#txtTest003", "instance": "ControlForm",
-                "strict_rules": [
-                  { "tag": "select", "type": "tag", "severity": "hight" }
-                ]
-              },
-              { "name": "btn_click_invisible", "selector": "#btnInvisibleAtTimeout" },
-              { "name": "btn_click_visible", "selector": "#btnVisibleAtTimeout" },
-              { "name": "title_buttons", "selector": "#titleButtons" }
-            ]
-          },
-          { "name": "qacode_logout",
-            "url": "http://netzulo.tk:83/qacode/logout",
-            "locator": "css selector",
-            "go_url": true,
-            "wait_url": 0,
-            "maximize": false,
-            "controls": [
-              { "name": "btn_logout", "selector": "a[href='/qacode/logout']" },
-              { "name": "btn_login", "selector": "a[href='/qacode/login']" }
-            ]
-          }
-        ]
-      }
-    ]
   }
-}
+}

qacode/core/__init__.py

@@ -3,10 +3,18 @@
 
 
 from qacode.core import bots
-from qacode.core import exceptions
+from qacode.core import browsers
+from qacode.core import controls
 from qacode.core import loggers
+from qacode.core import pages
 from qacode.core import testing
-from qacode.core import webs
 
 
-__all__ = ['bots', 'exceptions', 'loggers', 'testing', 'webs']
+__all__ = [
+    'bots',
+    'browsers',
+    'controls',
+    'loggers',
+    'pages',
+    'testing',
+]

qacode/core/bots/__init__.py

@@ -1,9 +1,12 @@
-# -*- coding: utf-8 -*-
-"""package qacode.core.bots"""
-
-
-from qacode.core.bots import bot_base
-from qacode.core.bots import modules
-
-
-__all__ = ['bot_base', 'modules']
+# -*- coding: utf-8 -*-
+"""package qacode.core.bots"""
+
+
+from qacode.core.bots import bot
+from qacode.core.bots import bot_config
+
+
+__all__ = [
+    'bot',
+    'bot_config',
+]