Skip to content

Commit

Permalink
Merge pull request #254 from qld-gov-au/QOLSVC-7731-new-pages-nav
Browse files Browse the repository at this point in the history
[QOLSVC-7731] Replace 'News and events' and 'Case studies' with 'Visualisations' and 'News and Case studies' in the navbar
  • Loading branch information
ienxckl authored Sep 30, 2024
2 parents e753141 + fab1625 commit 44d314a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@ jobs:

name: Run ${{ matrix.behave-tag }} tests on CKAN ${{ matrix.ckan-version }}
runs-on: ubuntu-latest
container: drevops/ci-builder:23.7.0
container: drevops/ci-runner:23.12.0
env:
CKAN_VERSION: ${{ matrix.ckan-version }}
BEHAVE_TAG: ${{ matrix.behave-tag }}

steps:
# Patch https://github.com/actions/runner/issues/863
- name: Preserve $HOME set in the container
run: echo HOME=/root >> "$GITHUB_ENV"

- uses: actions/checkout@v4
timeout-minutes: 2

Expand Down
4 changes: 2 additions & 2 deletions ckanext/data_qld/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
{% set dataset_search_route = 'dataset.search' %}
<li {% if h.current_url() != '/' %}class="active"{% endif %}><a href="{{ h.url_for(dataset_search_route) }}">Data</a></li>
<li>
<a href="/article/news-and-events">News and events</a>
<a href="/visualisations">Visualisations</a>
</li>
<li>
<a href="/article/case-studies">Case studies</a>
<a href="/news-and-case-studies">News and Case Studies</a>
</li>
<li>
<a href="/article/standards-and-guidance">Standards and guidance</a>
Expand Down
7 changes: 7 additions & 0 deletions test/features/data_qld_theme.feature
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,10 @@ Feature: Theme customisations
When I go to "/robots.txt"
Then I should see "Disallow: /"
And I should not see "Allow:"

@unauthenticated
Scenario: When I go to the home page, I can see Visualisations and News and Case Studies in the navbar
Given "Unauthenticated" as the persona
When I go to homepage
Then I should see an element with xpath "//a[string()='Visualisations']"
And I should see an element with xpath "//a[string()='News and Case Studies']"

0 comments on commit 44d314a

Please sign in to comment.