Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.7.3 #304

Merged
merged 8 commits into from
Jan 30, 2024
Merged

Release 1.7.3 #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff76ef6
Fixed running Paratest in Github Actions
stephen-cox Jan 10, 2024
9b8b8ae
Merge pull request #301 from localgovdrupal/fix/1.x/fix-paratest
stephen-cox Jan 16, 2024
22808fc
Add the is_front template flag using path.matcher service
andybroomfield Aug 30, 2023
54d97af
Add test for front page class
andybroomfield Jan 28, 2024
2ba7c29
Remove revisions from local tasks as Drupal generates this link
andybroomfield Jan 28, 2024
c160e6d
Increase weight on the delete task
andybroomfield Jan 28, 2024
e5ca79d
Merge pull request #303 from localgovdrupal/fix/1.x-302-extra-revisions
finnlewis Jan 30, 2024
2a7c282
Merge pull request #280 from localgovdrupal/fix/1.x-279-is-front-temp…
finnlewis Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
##
# Managed by https://github.com/localgovdrupal/github_workflow_manager
---
name: Test localgovdrupal/localgov_alert_banner drupal-module

on:
Expand Down Expand Up @@ -215,4 +212,4 @@ jobs:
mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
7 changes: 1 addition & 6 deletions localgov_alert_banner.links.task.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ entity.localgov_alert_banner.edit_form:
base_route: entity.localgov_alert_banner.canonical
title: 'Edit'

entity.localgov_alert_banner.version_history:
route_name: entity.localgov_alert_banner.version_history
base_route: entity.localgov_alert_banner.canonical
title: 'Revisions'

entity.localgov_alert_banner.status_form:
route_name: entity.localgov_alert_banner.status_form
base_route: entity.localgov_alert_banner.canonical
Expand All @@ -26,7 +21,7 @@ entity.localgov_alert_banner.delete_form:
route_name: entity.localgov_alert_banner.delete_form
base_route: entity.localgov_alert_banner.canonical
title: Delete
weight: 10
weight: 20

entity.localgov_alert_banner.collection:
route_name: entity.localgov_alert_banner.collection
Expand Down
8 changes: 8 additions & 0 deletions localgov_alert_banner.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ function localgov_alert_banner_preprocess(&$variables) {
if ($route_name == 'entity.localgov_alert_banner.status_form') {
unset($variables['content']['content_moderation_control']);
}

// Set is_front variable.
try {
$variables['is_front'] = \Drupal::service('path.matcher')->isFrontPage();
}
catch (Exception $e) {
$variables['is_front'] = FALSE;
}
}
}

Expand Down
8 changes: 8 additions & 0 deletions tests/src/Functional/AlertBannerBlockTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ public function testAlertBannerDisplays() {
// Load the front page and check the banner is displayed.
$this->drupalGet('<front>');
$this->assertSession()->pageTextContains($alert_message);

// Check that the front page class exists.
$this->assertSession()->responseContains('localgov-alert-banner--homepage');

// Check front pages class not visible on second page.
$this->drupalGet('/admin');
$this->assertSession()->responseContains('localgov-alert-banner');
$this->assertSession()->responseNotContains('localgov-alert-banner--homepage');
}

/**
Expand Down
Loading