Merge pull request #83 from UpstreamDataInc/dev_pre-commit_ci

UpstreamDataInc · Aug 23, 2024 · 3b4fde3 · 3b4fde3
2 parents 954f41e + d8e6a30
commit 3b4fde3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 5 deletions.
diff --git a/.djlintrc b/.djlintrc
@@ -1,3 +1,3 @@
 {
-    "ignore": "H030,H031"
+    "ignore": "H030,H031,H021"
 }
diff --git a/.github/workflows/pr-run-tests.yml b/.github/workflows/pr-run-tests.yml
@@ -0,0 +1,34 @@
+name: Test PRs
+
+on:
+  pull_request:
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: pip
+      - name: Install poetry
+        uses: abatilo/actions-poetry@v2
+      - name: Install dependencies
+        run: poetry install --with tests
+      - name: Run tests
+        env:
+          REPORT_OUTPUT: md_report.md
+        shell: bash
+        run: |
+          echo "REPORT_FILE=${REPORT_OUTPUT}" >> "$GITHUB_ENV"
+          poetry run pytest -v --md-report --md-report-flavor gfm --md-report-exclude-outcomes passed skipped xpassed --md-report-output "$REPORT_OUTPUT"
+      - name: Render the report to the PR when tests fail
+        uses: marocchino/sticky-pull-request-comment@v2
+        if: failure()
+        with:
+          header: test-report
+          recreate: true
+          path: ${{ env.REPORT_FILE }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,3 +1,6 @@
+ci:
+  skip:
+    - pytest
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0

diff --git a/goosebit/ui/templates/nav.html.jinja b/goosebit/ui/templates/nav.html.jinja
@@ -46,11 +46,12 @@
     <body data-bs-theme="dark">
         <nav class="navbar navbar-expand-lg bg-body-tertiary">
             <div class="container-fluid">
-                <a class="navbar-brand" href="/ui/home">
+                <a class="navbar-brand" href="{{ request.url_for("home_ui") }}">
                     <img src="{{ request.url_for('static', path='svg/goosebit-logo.svg') }}"
                          class="me-2"
-                         style="height: 30px;
-                                width: 30px" />
+                         height="30px"
+                         width="30px"
+                         alt="gooseBit logo" />
                     gooseBit
                 </a>
                 <button class="navbar-toggler"
@@ -74,7 +75,7 @@
                         {% endfor %}
                     </div>
                     <div class="navbar-nav d-flex flex-fill justify-content-end">
-                        <a class="nav-link" href="/logout">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
+                        <a class="nav-link" href="{{ request.url_for("logout") }}">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
                     </div>
                 </div>
             </div>

diff --git a/pyproject.toml b/pyproject.toml
@@ -44,6 +44,7 @@ mkdocs-material = "^9.5.29"
 [tool.poetry.group.tests.dependencies]
 pytest = "^8.3.1"
 pytest-asyncio = "^0.23.8"
+pytest-md-report = "^0.6.2"
 
 [tool.isort]
 profile = "black"