From ff6db7d480433ebd82260446e15e2b83e4aac648 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 14 Jul 2022 12:06:51 +1200 Subject: [PATCH] MNT Use GitHub Actions CI --- .github/workflows/ci.yml | 16 ++++++++++++++++ .github/workflows/keepalive.yml | 17 +++++++++++++++++ README.md | 2 +- composer.json | 3 ++- tests/CommentsTest.php | 4 ++-- 5 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/keepalive.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ead73c5 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: + push: + pull_request: + workflow_dispatch: + # Every Wednesday at 11:10am UTC + schedule: + - cron: '10 11 * * 3' + +jobs: + ci: + name: CI + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml new file mode 100644 index 0000000..ebf9716 --- /dev/null +++ b/.github/workflows/keepalive.yml @@ -0,0 +1,17 @@ +name: Keepalive + +on: + workflow_dispatch: + # The 4th of every month at 10:50am UTC + schedule: + - cron: '50 10 4 * *' + +jobs: + keepalive: + name: Keepalive + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Keepalive + uses: silverstripe/gha-keepalive@v1 diff --git a/README.md b/README.md index b27d1ee..29bba67 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Comments -[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-comments.svg?branch=3)](https://travis-ci.com/silverstripe/silverstripe-comments) +[![CI](https://github.com/silverstripe/silverstripe-comments/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-comments/actions/workflows/ci.yml) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/silverstripe/silverstripe-comments.svg)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-comments/?branch=master) [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) [![Code Coverage](https://img.shields.io/codecov/c/github/silverstripe/silverstripe-comments.svg)](https://codecov.io/gh/silverstripe/silverstripe-comments) diff --git a/composer.json b/composer.json index 6426f07..89d0c60 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.0" + "squizlabs/php_codesniffer": "^3.0", + "ezyang/htmlpurifier": "^4.14" }, "extra": { "expose": [ diff --git a/tests/CommentsTest.php b/tests/CommentsTest.php index 6d213a8..afd92ad 100644 --- a/tests/CommentsTest.php +++ b/tests/CommentsTest.php @@ -462,7 +462,7 @@ public function testDefaultTemplateRendersHtmlWithAllowHtml() $comment->write(); $html = $item->customise(['CommentsEnabled' => true])->renderWith('CommentsInterface'); - $this->assertContains( + $this->assertStringContainsString( '<p>my comment</p>', $html ); @@ -470,7 +470,7 @@ public function testDefaultTemplateRendersHtmlWithAllowHtml() $comment->AllowHtml = true; $comment->write(); $html = $item->customise(['CommentsEnabled' => true])->renderWith('CommentsInterface'); - $this->assertContains( + $this->assertStringContainsString( '

my comment

', $html );