Skip to content

Commit

Permalink
Merge pull request #102 from Integration-Automation/dev
Browse files Browse the repository at this point in the history
Update dev and stable version
  • Loading branch information
JE-Chen45 authored Aug 14, 2023
2 parents 4033a99 + ad74540 commit 2f68e3e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 44 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

## Requires
> python 3.8 or later
> python 3.9 or later
### Architecture Diagram
![Architecture Diagram](architecture_diagram/APITestka_Architecture.drawio.png)
8 changes: 4 additions & 4 deletions dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ build-backend = "setuptools.build_meta"

[project]
name = "je_api_testka_dev"
version = "0.0.103"
version = "0.0.105"
authors = [
{ name = "JE-Chen", email = "[email protected]" },
]
description = "Requests Automation Framework"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = { text = "MIT" }
dependencies = [
"requests", "Flask", "APScheduler", "httpx"
"requests", "Flask", "APScheduler==3.10.1", "httpx"
]
classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Development Status :: 2 - Pre-Alpha",
"Environment :: Win32 (MS Windows)",
"Environment :: MacOS X",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

# -- Project information -----------------------------------------------------

project = 'je_api_testka'
copyright = '2022, JE-Chen'
project = 'API Testka'
copyright = '2020 ~ Now, JE-Chen'
author = 'JE-Chen'

# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Welcome to APITestka's documentation!
Welcome to APITestka documentation!
----

.. toctree::
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ build-backend = "setuptools.build_meta"

[project]
name = "je_api_testka"
version = "0.0.117"
version = "0.0.119"
authors = [
{ name = "JE-Chen", email = "[email protected]" },
]
description = "Requests Automation Framework"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = { text = "MIT" }
dependencies = [
"requests", "Flask", "APScheduler", "httpx"
"requests", "Flask", "APScheduler==3.10.1", "httpx"
]
classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Development Status :: 2 - Pre-Alpha",
"Environment :: Win32 (MS Windows)",
"Environment :: MacOS X",
Expand Down
27 changes: 8 additions & 19 deletions test/httpx/sync/unit_test/executor_test/execute_action_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,7 @@

test_action_list = [
["AT_test_api_method_httpx",
{"http_method": "get", "test_url": "http://httpbin.org/get",
"headers": {
"x-requested-with": "XMLHttpRequest",
"Content-Type": "application/x-www-form-urlencoded",
"User-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36",
}
}
],
["AT_test_api_method_httpx",
{"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"},
"result_check_dict": {"status_code": 200}
}
{"http_method": "get", "test_url": "http://google.com"}
]
]

Expand All @@ -31,7 +20,8 @@
assert response.get("end_time") is not None

test_action_list = [
["AT_test_api_method_httpx", {"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
["AT_test_api_method_httpx",
{"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
["AT_test_api_method_httpx", {"http_method": "post", "test_url": "http://httpbin.org/post"}]
]
except Exception as error:
Expand All @@ -46,9 +36,9 @@

test_action_list = [
["AT_test_api_method_httpx", {"http_method": "dwadawdwaw",
"test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
"test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
["AT_test_api_method_httpx", {"http_method": "dwadwadwadaw", "test_url": "http://httpbin.org/post",
"record_request_info": False}]
"record_request_info": False}]
]

try:
Expand All @@ -58,9 +48,10 @@
print(repr(error), file=sys.stderr)

test_action_list = [
["AT_test_api_method_httpx", {"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
["AT_test_api_method_httpx",
{"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"}}],
["AT_test_api_method_httpx", {"http_method": "post", "test_url": "http://httpbin.org/post",
"result_check_dict": {"status_code": 300}}
"result_check_dict": {"status_code": 300}}
],
["AT_generate_html", {"html_file_name": "generate_html_test"}]
]
Expand All @@ -85,5 +76,3 @@

print(request_time_list)
print(request_url_list)


14 changes: 1 addition & 13 deletions test/requests/unit_test/executor_test/execute_action_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,7 @@

test_action_list = [
["AT_test_api_method",
{"http_method": "get", "test_url": "http://httpbin.org/get",
"headers": {
"x-requested-with": "XMLHttpRequest",
"Content-Type": "application/x-www-form-urlencoded",
"User-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36",
}
}
],
["AT_test_api_method",
{"http_method": "post", "test_url": "http://httpbin.org/post", "params": {"task": "new task"},
"result_check_dict": {"status_code": 200}
}
]
{"http_method": "get", "test_url": "http://www.bing.com"}]
]

try:
Expand Down

0 comments on commit 2f68e3e

Please sign in to comment.