Merge pull request #15 from jaseci-labs/e2e-test-cases-added

Adding E2E tests

Author: MalithaPrabhashana

.github/workflows/e2e-tests.yml

@@ -3,18 +3,10 @@ name: JaSketch E2E Tests
 on:
   push:
     branches: [main, dev]
-    paths:
-      - "jasketch/**"
   pull_request:
     branches: [main]
-    paths:
-      - "jasketch/**"
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: jasketch
-
 jobs:
   e2e-tests:
     runs-on: ubuntu-latest
@@ -38,8 +30,7 @@ jobs:
         uses: oven-sh/setup-bun@v2
 
       - name: Install Jac and dependencies
-        run: |
-          pip install jaclang jac-client jac-scale pytest pytest-playwright pytest-timeout
+        run: pip install jaclang jac-client jac-scale pytest pytest-playwright pytest-timeout
 
       - name: Install Playwright browsers
         run: python -m playwright install --with-deps chromium
@@ -55,5 +46,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: e2e-test-results
-          path: jasketch/tests/e2e/
+          path: tests/e2e/
           retention-days: 7

tests/e2e/test_jasketch.py

@@ -174,9 +174,12 @@ class TestToolSelection:
     """Verify tool switching works."""
 
     def test_select_rectangle_tool(self, app: Page):
+        """Clicking Rectangle tool makes it the active tool."""
         select_tool(app, "Rectangle")
         btn = app.locator("button[title^='Rectangle']")
         expect(btn).to_be_visible()
+        btn_class = btn.get_attribute("class")
+        assert "text-orange-600" in btn_class, f"Rectangle should be active, class: {btn_class}"
 
     def test_select_tool_via_keyboard(self, app: Page):
         """Pressing number keys selects corresponding tools."""
@@ -455,14 +458,17 @@ def test_context_menu_appears(self, app: Page):
         press_key(app, "Escape")
 
     def test_duplicate_from_menu(self, app: Page):
-        """Duplicating via Ctrl+D creates a copy."""
+        """Duplicating via Ctrl+D creates a copy with same type."""
         clear_canvas(app)
         draw_shape(app, "Rectangle", S_X1, S_Y1, S_X2, S_Y2)
         wait_for_elements(app, 1)
         select_tool(app, "Select")
         click_canvas(app, S_CX, S_CY)
         press_key(app, "Control+d")
         wait_for_elements(app, 2)
+        elements = get_elements(app)
+        assert elements[0]["type"] == "rectangle", "Original should be rectangle"
+        assert elements[1]["type"] == "rectangle", "Duplicate should also be rectangle"
 
 
 # -- Zoom tests ----------------------------------------------------------------
@@ -472,13 +478,17 @@ class TestZoom:
     """Verify zoom controls work."""
 
     def test_zoom_in_button(self, app: Page):
-        """Clicking + zoom button increases zoom."""
+        """Clicking + zoom button increases zoom above 100%."""
         clear_canvas(app)
+        press_key(app, "Control+0")  # Reset to 100% first
         zoom_buttons = app.locator("button", has_text="+")
         zoom_buttons.last.click()
         app.wait_for_timeout(ACTION_DELAY)
-        zoom_text = app.locator("text=100%")
-        expect(zoom_text).not_to_be_visible()
+        # Zoom should now be above 100% (e.g., 110%)
+        zoom_btn = app.locator("button", has_text="%")
+        zoom_label = zoom_btn.text_content()
+        zoom_val = int(zoom_label.replace("%", ""))
+        assert zoom_val > 100, f"Zoom should be above 100% after zoom in, got {zoom_val}%"
 
     def test_zoom_reset(self, app: Page):
         """Ctrl+0 resets zoom to 100%."""
@@ -730,12 +740,12 @@ def test_ungroup_elements(self, app: Page):
         canvas.click(position={"x": 450, "y": 115}, button="right", force=True)
         app.wait_for_timeout(ACTION_DELAY)
         ungroup_btn = app.locator("button", has_text="Ungroup")
-        if ungroup_btn.is_visible():
-            ungroup_btn.click()
-            app.wait_for_timeout(1000)
-            elements = get_elements(app)
-            gid0 = elements[0].get("groupId")
-            assert gid0 is None or gid0 == "", f"Element 0 groupId should be cleared, got {gid0}"
+        expect(ungroup_btn).to_be_visible(timeout=3_000)
+        ungroup_btn.click()
+        app.wait_for_timeout(1000)
+        elements = get_elements(app)
+        gid0 = elements[0].get("groupId")
+        assert gid0 is None or gid0 == "", f"Element 0 groupId should be cleared, got {gid0}"
 
     def test_move_grouped_elements(self, app: Page):
         """Moving one element in a group moves all group members."""