Skip to content

Merge from master #228

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

Merged
s-nakajima merged 5 commits into from
Apr 28, 2023
Merged

Merge from master #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da90fc6
fix: test: WorkflowBehavior修正にともないエラーになったテストの修正
RyujiAMANO Jan 12, 2023
144d978
change: PHP7.1を自動テストの対象から外した。
RyujiAMANO Jan 12, 2023
f42a7c7
Merge pull request #227 from NetCommons3/fix/brokenTest
RyujiAMANO Jan 12, 2023
e6f72e1
test: Github Actionエラー修正
s-nakajima Feb 24, 2023
7d9d29e
change: Version number to 3.3.6
s-nakajima Feb 25, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-18.04
strategy:
matrix:
php: [ '7.1', '7.2', '7.3', '7.4' ]
php: [ '7.2', '7.3', '7.4' ]
mysql: [ '5.7', '8.0' ]

env:
Expand All @@ -44,6 +44,7 @@ jobs:
MYSQL_VERSION: ${{ matrix.mysql }}
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: cakephp_test
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion Test/Case/Controller/QuestionnaireAnswersController/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ public function testGetShuffle() {
'action' => 'view',
'frame_id' => 6,
'block_id' => 2,
'key' => 'questionnaire_4'
'key' => 'questionnaire_4',
'?' => ['lang' => 'ja']
);
$assert = array('method' => 'assertTextContains', 'expected' => __d('questionnaires', 'This questionnaire is being temporarily stored . You can questionnaire test before performed in this page . If you want to modify or change the questionnaire , you will be able to edit by pressing the [ Edit question ] button in the upper-right corner .'));

Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6