fix

Kanchan-Microsoft · Kanchan-Microsoft · commit f80bcf8790a2 · 2026-01-19T17:18:26.000+05:30
diff --git a/tests/e2e-test/pages/HomePage.py b/tests/e2e-test/pages/HomePage.py
@@ -3,6 +3,7 @@
 import os.path
 
 from base.base import BasePage
+from config.constants import URL
 
 from playwright.sync_api import expect
 
@@ -48,10 +49,20 @@ class HomePage(BasePage):
 
     # Harmful file validation message
     ERROR_MSG_UNABLE_TO_PROCESS = "//span[normalize-space()='Unable to process the file']"
+    HARMFUL_FILE_2 = "//span[.='harmful_content_2 2.sql']"
+
 
     def __init__(self, page):
         self.page = page
 
+    def navigate_to_base_url(self):
+        """
+        Navigate to the base URL and wait for page load.
+        """
+        self.page.goto(URL, wait_until="domcontentloaded")
+        self.page.wait_for_timeout(2000)
+        logger.info(f"Navigated to base URL: {URL}")
+
     def validate_home_page(self):
         expect(self.page.locator(self.TITLE_TEXT)).to_be_visible()
 
@@ -62,27 +73,27 @@ def upload_files(self):
             self.page.wait_for_load_state("networkidle")
         file_chooser = fc_info.value
         current_working_dir = os.getcwd()
-        file_path1 = os.path.join(current_working_dir, "testdata/Valid_files/q1_informix.sql")
-        file_path2 = os.path.join(current_working_dir, "testdata/Valid_files/f1.sql")
-        file_path3 = os.path.join(current_working_dir, "testdata/Valid_files/f2.sql")
+        file_path1 = os.path.join(current_working_dir, "testdata/valid_files/q1_informix.sql")
+        file_path2 = os.path.join(current_working_dir, "testdata/valid_files/f1.sql")
+        file_path3 = os.path.join(current_working_dir, "testdata/valid_files/f2.sql")
         file_chooser.set_files([file_path1, file_path2, file_path3])
         self.page.wait_for_timeout(10000)
         self.page.wait_for_load_state("networkidle")
         expect(self.page.locator(self.SUCCESS_MSG)).to_be_visible()
 
     def upload_all_files(self):
         """
-        Upload all files present in the testdata/Valid_files folder.
+        Upload all files present in the testdata/valid_files folder.
         """
         with self.page.expect_file_chooser() as fc_info:
             self.page.locator(self.BROWSE_FILES).click()
             self.page.wait_for_timeout(5000)
             self.page.wait_for_load_state("networkidle")
         file_chooser = fc_info.value
         current_working_dir = os.getcwd()
-        testdata_dir = os.path.join(current_working_dir, "testdata/Valid_files")
-
-        # Get all files from testdata/Valid_files folder
+        testdata_dir = os.path.join(current_working_dir, "testdata/valid_files")
+        
+        # Get all files from testdata/valid_files folder
         all_files = []
         if os.path.exists(testdata_dir) and os.path.isdir(testdata_dir):
             for filename in os.listdir(testdata_dir):
@@ -127,7 +138,7 @@ def remove_first_three_files_and_validate_count(self):
         remove_buttons = self.page.locator(self.REMOVE_FILE_BTN)
 
         # Remove first three files
-        for _i in range(3):
+        for i in range(3):
             remove_buttons.first.click()
             self.page.wait_for_timeout(2000)
 
@@ -253,7 +264,12 @@ def upload_harmful_file_and_validate(self):
             self.page.wait_for_timeout(10000)
             self.page.wait_for_load_state("networkidle")
             logger.info("Translation process started")
-
+            
+            # Click on harmful_content_2 2.sql file
+            self.page.locator(self.HARMFUL_FILE_2).click()
+            self.page.wait_for_timeout(2000)
+            logger.info("Clicked on harmful_content_2 2.sql file")
+            
             # Validate error message is visible
             try:
                 expect(self.page.locator(self.ERROR_MSG_UNABLE_TO_PROCESS)).to_be_visible(timeout=200000)
@@ -280,7 +296,7 @@ def upload_harmful_file_and_validate(self):
     def validate_translate(self):
         self.page.locator(self.TRANSLATE_BTN).click()
         expect(self.page.locator(self.DOWNLOAD_FILES)).to_be_enabled(timeout=200000)
-        self.page.locator(self.SUMMARY).click()
+        self.page.locator(self.SUMMARY).first.click()
         expect(self.page.locator(self.FILE_PROCESSED_MSG)).to_be_visible()
         self.page.wait_for_timeout(3000)
 
diff --git a/tests/e2e-test/tests/conftest.py b/tests/e2e-test/tests/conftest.py
@@ -2,6 +2,7 @@
 import io
 import logging
 import os
+from datetime import datetime
 
 
 from bs4 import BeautifulSoup
@@ -13,6 +14,11 @@
 import pytest
 
 
+# Create screenshots directory if it doesn't exist
+SCREENSHOTS_DIR = os.path.join(os.path.dirname(__file__), "screenshots")
+os.makedirs(SCREENSHOTS_DIR, exist_ok=True)
+
+
 @pytest.fixture(scope="session")
 def login_logout():
     # perform login and browser close once in a session
@@ -64,9 +70,45 @@ def pytest_runtest_setup(item):
 
 @pytest.hookimpl(hookwrapper=True)
 def pytest_runtest_makereport(item, call):
+    """Generate test report with logs, subtest details, and screenshots on failure"""
     outcome = yield
     report = outcome.get_result()
 
+    # Capture screenshot on failure
+    if report.when == "call" and report.failed:
+        # Get the page fixture if it exists
+        if "login_logout" in item.fixturenames:
+            page = item.funcargs.get("login_logout")
+            if page:
+                try:
+                    # Generate screenshot filename with timestamp
+                    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+                    test_name = item.name.replace(" ", "_").replace("/", "_")
+                    screenshot_name = f"screenshot_{test_name}_{timestamp}.png"
+                    screenshot_path = os.path.join(SCREENSHOTS_DIR, screenshot_name)
+                    
+                    # Take screenshot
+                    page.screenshot(path=screenshot_path)
+                    
+                    # Add screenshot link to report
+                    if not hasattr(report, 'extra'):
+                        report.extra = []
+                    
+                    # Add screenshot as a link in the Links column
+                    # Use relative path from report.html location
+                    relative_path = os.path.relpath(
+                        screenshot_path,
+                        os.path.dirname(os.path.abspath("report.html"))
+                    )
+                    
+                    # pytest-html expects this format for extras
+                    from pytest_html import extras
+                    report.extra.append(extras.url(relative_path, name='Screenshot'))
+                    
+                    logging.info("Screenshot saved: %s", screenshot_path)
+                except Exception as exc:  # pylint: disable=broad-exception-caught
+                    logging.error("Failed to capture screenshot: %s", str(exc))
+
     handler, stream = log_streams.get(item.nodeid, (None, None))
 
     if handler and stream:
@@ -78,8 +120,44 @@ def pytest_runtest_makereport(item, call):
         logger = logging.getLogger()
         logger.removeHandler(handler)
 
-        # Store the log output on the report object for HTML reporting
-        report.description = f"<pre>{log_output.strip()}</pre>"
+        # Check if there are subtests
+        subtests_html = ""
+        if hasattr(item, 'user_properties'):
+            item_subtests = [
+                prop[1] for prop in item.user_properties if prop[0] == "subtest"
+            ]
+            if item_subtests:
+                subtests_html = (
+                    "<div style='margin-top: 10px;'>"
+                    "<strong>Step-by-Step Details:</strong>"
+                    "<ul style='list-style: none; padding-left: 0;'>"
+                )
+                for idx, subtest in enumerate(item_subtests, 1):
+                    status = "✅ PASSED" if subtest.get('passed') else "❌ FAILED"
+                    status_color = "green" if subtest.get('passed') else "red"
+                    subtests_html += (
+                        f"<li style='margin: 10px 0; padding: 10px; "
+                        f"border-left: 3px solid {status_color}; "
+                        f"background-color: #f9f9f9;'>"
+                    )
+                    subtests_html += (
+                        f"<div style='font-weight: bold; color: {status_color};'>"
+                        f"{status} - {subtest.get('msg', f'Step {idx}')}</div>"
+                    )
+                    if subtest.get('logs'):
+                        subtests_html += (
+                            f"<pre style='margin: 5px 0; padding: 5px; "
+                            f"background-color: #fff; border: 1px solid #ddd; "
+                            f"font-size: 11px;'>{subtest.get('logs').strip()}</pre>"
+                        )
+                    subtests_html += "</li>"
+                subtests_html += "</ul></div>"
+
+        # Combine main log output with subtests
+        if subtests_html:
+            report.description = f"<pre>{log_output.strip()}</pre>{subtests_html}"
+        else:
+            report.description = f"<pre>{log_output.strip()}</pre>"
 
         # Clean up references
         log_streams.pop(item.nodeid, None)
diff --git a/tests/e2e-test/tests/test_codegen_gp_tc.py b/tests/e2e-test/tests/test_codegen_gp_tc.py
@@ -29,6 +29,7 @@ def test_codegen_golden_path(login_logout, request):
 
     # Define step-wise test actions for Golden Path
     golden_path_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Validate Upload of other than SQL files", lambda: home.upload_unsupported_files()),
         ("03. Validate Upload input files for SQL only", lambda: home.upload_files()),
@@ -63,6 +64,7 @@ def test_upload_all_files_and_navigate_home(login_logout, request):
 
     # Define test steps
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Upload all files from testdata folder", lambda: home.upload_all_files()),
         ("03. Validate uploaded files count equals 20", lambda: home.validate_uploaded_files_count()),
@@ -94,6 +96,7 @@ def test_translate_and_download_files(login_logout, request):
 
     # Define step-wise test actions for translation and download workflow
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Validate Upload of other than SQL files", lambda: home.upload_unsupported_files()),
         ("03. Validate Upload input files for SQL only", lambda: home.upload_files()),
@@ -128,6 +131,7 @@ def test_upload_remove_files_and_cancel(login_logout, request):
 
     # Define test steps
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Upload all files from testdata folder (20 files max)", lambda: home.upload_all_files()),
         ("03. Validate uploaded files count equals 20", lambda: home.validate_uploaded_files_count()),
@@ -160,6 +164,7 @@ def test_delete_batch_history(login_logout, request):
 
     # Define test steps (golden path without return home + delete batch history)
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Validate Upload of other than SQL files", lambda: home.upload_unsupported_files()),
         ("03. Validate Upload input files for SQL only", lambda: home.upload_files()),
@@ -194,6 +199,7 @@ def test_upload_unsupported_files_validation(login_logout, request):
 
     # Define test steps
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Upload all unsupported files and validate translate button is disabled", lambda: home.upload_all_unsupported_files_and_validate()),
     ]
@@ -223,6 +229,7 @@ def test_upload_harmful_file_validation(login_logout, request):
 
     # Define test steps
     test_steps = [
+        ("00. Navigate to base URL", lambda: home.navigate_to_base_url()),
         ("01. Validate home page is loaded", lambda: home.validate_home_page()),
         ("02. Upload harmful file, translate, and validate error handling", lambda: home.upload_harmful_file_and_validate()),
         ("03. Return to home page", lambda: home.return_to_home_page()),
