Merge pull request #4 from naodeng/main

update demo

.gitignore

@@ -160,4 +160,5 @@ cython_debug/
 #.idea/
 
 allure-report/
-.idea/
+.idea/
+report

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
 # allure
-# addopts = -vs -rf --html-report=./report --title='PYTEST REPORT' --self-contained-html
+# addopts = --alluredir ./allure-report
 # pytest-html
 addopts = -vs -rf --html-report=./report --title='PYTEST REPORT' --self-contained-html

requirements.txt

@@ -17,4 +17,3 @@ pytest-metadata==3.0.0
 requests==2.31.0
 urllib3==2.0.7
 pytest-custom-exit-code==0.3.0
-

test_case/test_demo_allure.py

@@ -1,12 +1,10 @@
+import allure
 import requests
 
 
-<<<<<<< HEAD:test_case/test_demo.py
-class TestPytestDemo:
-=======
 @allure.title("Test example get endpoint")
 @allure.description("Test the example get API endpoint")
-def test_get_example_endpoint(env_config, env_request_data, env_response_data):
+def test_get_example_endpoint_allure(env_config, env_request_data, env_response_data):
     host = env_config["host"]
     get_api = env_config["getAPI"]
     get_api_request_data = env_request_data["getAPI"]
@@ -18,35 +16,11 @@ def test_get_example_endpoint(env_config, env_request_data, env_response_data):
     assert response.status_code == 200
     print("verify the response data")
     assert response.json() == get_api_response_data
->>>>>>> bb894ee (update demo):test_case/test_demo_allure.py
 
-    def test_get_demo(self):
-        base_url = "https://jsonplaceholder.typicode.com"
-        # 发起请求
-        response = requests.get(f"{base_url}/posts/1")
-        # 断言
-        assert response.status_code == 200
-        assert response.json()['userId'] == 1
-        assert response.json()['id'] == 1
 
-<<<<<<< HEAD:test_case/test_demo.py
-    def test_post_demo(self):
-        base_url = "https://jsonplaceholder.typicode.com"
-        requests_data = {
-            "title": "foo",
-            "body": "bar",
-            "userId": 1
-        }
-        # 发起请求
-        response = requests.post(f"{base_url}/posts", requests_data)
-        # 断言
-        assert response.status_code == 201
-        assert response.json()['userId'] == '1'
-        assert response.json()['id'] == 101
-=======
 @allure.title("Test example POST endpoint")
 @allure.description("Test the example POST API endpoint")
-def test_post_example_endpoint(env_config, env_request_data, env_response_data):
+def test_post_example_endpoint_allure(env_config, env_request_data, env_response_data):
     host = env_config["host"]
     post_api = env_config["postAPI"]
     post_api_request_data = env_request_data["postAPI"]
@@ -58,4 +32,3 @@ def test_post_example_endpoint(env_config, env_request_data, env_response_data):
     assert response.status_code == 201
     print("verify the response data")
     assert response.json() == post_api_response_data
->>>>>>> bb894ee (update demo):test_case/test_demo_allure.py