Rename MySession to ApiSession; Fix file paths in api tests.

Author: aleksandr-kotlyar

fixtures_session.py

@@ -1,11 +1,12 @@
+# pylint: disable=missing-function-docstring
 import pytest
 
-from src.main.session import MySession, HttpbinApiSessionLevelOne, HttpbinApiSessionLevelTwo
+from src.main.session import ApiSession, HttpbinApiSessionLevelOne, HttpbinApiSessionLevelTwo
 
 
 @pytest.fixture(scope='session', autouse=True)
-def api_session() -> MySession:
-    with MySession() as session:
+def api_session() -> ApiSession:
+    with ApiSession() as session:
         yield session
 
 

src/main/file.py

@@ -6,7 +6,7 @@
 
 def read_json(filename):
     """Read json and attach to allure as file."""
-    with open(os.path.join(os.getcwd(), 'src', 'test', 'resources', filename)) as file:
+    with open(os.path.join(os.getcwd(), 'resources', filename)) as file:
         schema = json.loads(file.read())
     allure.attach(body=json.dumps(schema, indent=2, ensure_ascii=False).encode('utf8'),
                   name='Json schema', attachment_type=allure.attachment_type.JSON)

src/main/session.py

@@ -7,7 +7,7 @@
 from src.main.allure_helpers import allure_request_logger
 
 
-class MySession(Session):
+class ApiSession(Session):
 
     @allure_request_logger
     def request(self, method, url, **kwargs) -> Response:

src/test/test_api.py

@@ -28,7 +28,7 @@ def test_patch(self):
         with open(os.path.join(os.path.dirname(__file__), 'resources', 'patch.json')) as file:
             schema = json.loads(file.read())
 
-        body = requests.get('https://httpbin.org/patch').json()
+        body = requests.patch('https://httpbin.org/patch').json()
 
         validictory.validate(body, schema, fail_fast=False)
 
@@ -63,7 +63,7 @@ def test_patch(self):
                       name='Json schema', attachment_type=allure.attachment_type.JSON)
 
         allure.attach(url, 'Requested API', allure.attachment_type.URI_LIST)
-        body = requests.get(url).json()
+        body = requests.patch(url).json()
         allure.attach(body=json.dumps(body, indent=2, ensure_ascii=False).encode('utf8'),
                       name="Response", attachment_type=allure.attachment_type.JSON)
 
@@ -131,22 +131,22 @@ def request(self, method, url):
                       name="Response", attachment_type=allure.attachment_type.JSON)
         return body
 
-    def httpbin(self, method, url):
+    def http_bin(self, method, url):
         return self.request(method, f'https://httpbin.org{url}')
 
     @allure.title('GET "https://httpbin.org/get"')
     def test_get(self):
         schema = file.read_json('get.json')
 
-        body = self.httpbin('get', '/get')
+        body = self.http_bin('get', '/get')
 
         validictory.validate(body, schema, fail_fast=False)
 
     @allure.title('PATCH "https://httpbin.org/patch"')
     def test_patch(self):
         schema = file.read_json('patch.json')
 
-        body = self.httpbin('patch', '/patch').json()
+        body = self.http_bin('patch', '/patch')
 
         validictory.validate(body, schema, fail_fast=False)