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

Make PHP 8.1 + Drupal 10.1 the default in CI matrix tests #4033

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Make PHP 8.1 + Drupal 10.1 the default in CI matrix tests #4033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fbd7423
Make PHP 8.1 + Drupal 10.1 the default in the matrix tests
jastraat Oct 2, 2023
e7d75ed
Admin dataset view no longer has confirm step when using bulk actions
jastraat Oct 3, 2023
23a71d5
Admin dataset view no longer has confirm step when using bulk actions
jastraat Oct 3, 2023
b1ab0c5
Add PHP 8.1 + Drupal 9.5
jastraat Oct 3, 2023
25e7248
Add PHP 8.2 + Drupal 10.1 to see what breaks.
jastraat Oct 3, 2023
ba4ed10
Remove PHP 8.2 for now.
jastraat Oct 3, 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
35 changes: 15 additions & 20 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ commands:
parameters:
php_version:
description: 'PHP major.minor for DDev to use.'
default: '8.0'
default: '8.1'
type: string
addon_branch:
description: 'Repo branch name for the dkan-ddev-addon you want to test against.'
default: 'main'
type: string
dkan_recommended_branch:
description: 'Branch of getdkan/recommended-project to use.'
default: '9.5.x-dev'
default: '10.1.x-dev'
type: string
steps:
- run:
Expand Down Expand Up @@ -117,11 +117,11 @@ jobs:
parameters:
php_version:
description: 'PHP major.minor for DDev to use.'
default: '8.0'
default: '8.1'
type: string
dkan_recommended_branch:
description: 'Branch of getdkan/recommended-project to use.'
default: '9.5.x-dev'
default: '10.1.x-dev'
type: string
report_coverage:
description: 'Generate coverage report and send it to CodeClimate'
Expand Down Expand Up @@ -184,11 +184,11 @@ jobs:
parameters:
php_version:
description: 'PHP major.minor for DDev to use.'
default: '8.0'
default: '8.1'
type: string
dkan_recommended_branch:
description: 'Branch of getdkan/recommended-project to use.'
default: '9.5.x-dev'
default: '10.1.x-dev'
type: string
upgrade:
description: 'If true, will install the latest stable DKAN version and test upgrade'
Expand Down Expand Up @@ -227,7 +227,7 @@ workflows:
jobs:
- cypress:
name: install_test_cypress
dkan_recommended_branch: '9.5.x-dev'
dkan_recommended_branch: '10.1.x-dev'
- phpunit:
matrix:
parameters:
Expand All @@ -237,34 +237,29 @@ workflows:
matrix:
parameters:
dkan_recommended_branch: [ '9.5.x-dev']
php_version: [ '7.4', '8.1' ]
php_version: [ '7.4', '8.0', '8.1' ]
- phpunit:
name: 'Install target (Drupal 9.5, PHP 8.0)'
name: 'Install target (Drupal 10.1, PHP 8.1)'
report_coverage: true
matrix:
parameters:
dkan_recommended_branch: [ '9.5.x-dev']
php_version: [ '8.0' ]
dkan_recommended_branch: [ '10.1.x-dev']
php_version: [ '8.1' ]
- phpunit:
matrix:
parameters:
dkan_recommended_branch: [ '10.0.x-dev']
php_version: [ '8.1' ]
- phpunit:
matrix:
parameters:
dkan_recommended_branch: [ '10.1.x-dev' ]
php_version: [ '8.1' ]
upgrade_and_test:
jobs:
- cypress:
name: upgrade_test_cypress
upgrade: true
dkan_recommended_branch: '9.5.x-dev'
dkan_recommended_branch: '10.1.x-dev'
- phpunit:
name: 'Upgrade target (Drupal 9.5, PHP 8.0)'
name: 'Upgrade target (Drupal 10.1, PHP 8.1)'
upgrade: true
matrix:
parameters:
dkan_recommended_branch: [ '9.5.x-dev']
php_version: [ '8.0' ]
dkan_recommended_branch: [ '10.1.x-dev']
php_version: [ '8.1' ]
5 changes: 2 additions & 3 deletions cypress/integration/07_admin_dataset_json_form.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ context('Admin dataset json form', () => {
// Delete dataset.
cy.visit(baseurl + "/admin/dkan/datasets")
cy.wait(2000)
cy.get('#edit-action').select('Delete content',{ force: true }).should('have.value', 'node_delete_action')
cy.get('#edit-node-bulk-form-0').check({ force:true })
cy.get('#edit-submit--2').click({ force:true })
cy.get('.button').contains('Yes').click({ force:true });
cy.get('#edit-action').select('Delete content',{ force: true }).should('have.value', 'node_delete_action')
cy.get('#edit-submit').click({ force:true })
cy.get('input[value="Delete"]').click({ force:true })
cy.get('.messages__content').should('contain','Deleted 1 content item.')
})
Expand Down
12 changes: 4 additions & 8 deletions cypress/integration/08_admin_views.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,26 @@ context('Admin content and dataset views', () => {
// Change the state of the first dataset from published to published hidden.
cy.get('#edit-node-bulk-form-0').click({force:true})
cy.get('#edit-action').select('Hide current revision',{ force: true }).should('have.value', 'hide_current')
cy.get('#edit-submit--2').click({ force:true })
cy.get('.button').contains('Yes').click({ force:true })
cy.get('#edit-submit').click({ force:true })
cy.get('tbody > :nth-child(1) > .views-field-status').should('contain', 'Published')
cy.get('tbody > :nth-child(1) > .views-field-moderation-state', {timeout: 2000}).should('contain', 'Published (hidden)')
// Change the state of the first dataset from hidden to archived.
cy.get('#edit-node-bulk-form-0').click({force:true})
cy.get('#edit-action').select('Archive current revision',{ force: true }).should('have.value', 'archive_current')
cy.get('#edit-submit--2').click({ force:true })
cy.get('.button').contains('Yes').click({ force:true });
cy.get('#edit-submit').click({ force:true })
cy.get('tbody > :nth-child(1) > .views-field-status', {timeout: 2000}).should('contain', 'Unpublished')
cy.get('tbody > :nth-child(1) > .views-field-moderation-state', {timeout: 2000}).should('contain', 'Archived')
// Change the state of the first dataset from archived to published.
cy.get('#edit-node-bulk-form-0').click({force:true})
cy.get('#edit-action').select('Publish latest revision',{ force: true }).should('have.value', 'publish_latest')
cy.get('#edit-submit--2').click({ force:true })
cy.get('.button').contains('Yes').click({ force:true })
cy.get('#edit-submit').click({ force:true })
cy.get('tbody > :nth-child(1) > .views-field-status', {timeout: 2000}).should('contain', 'Published')
cy.get('tbody > :nth-child(1) > .views-field-moderation-state', {timeout: 2000}).should('contain', 'Published')
// Delete the dataset.
cy.get('#edit-node-bulk-form-0').click({force:true})
cy.get('#edit-action').select('Delete content',{ force: true }).should('have.value', 'node_delete_action')
cy.get('#edit-submit--2').click({ force:true })
cy.get('.button').contains('Yes').click({ force:true })
cy.get('#edit-submit').click({ force:true })
cy.get('.button').contains('Delete').click({ force:true })
cy.get('.messages--status').should('contain','Deleted 1 content item.')
})

Expand Down