Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Check Conventional PR

on:
pull_request:
branches: [ 1.x, 2.x, 3.x, 4.x ]

jobs:
build:
name: Ensure Conventional Commits
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
- uses: beemojs/conventional-pr-action@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22 changes: 12 additions & 10 deletions test-config/project/project.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
dateModified: 1616079770
dateModified: 1738659450
email:
fromEmail: support@craftcms.com
fromName: 'Craft test site'
transportType: craft\mail\transportadapters\Sendmail
graphql:
publicToken:
enabled: false
expiryDate: null
meta:
__names__:
0ec9b1fd-034b-4a84-99af-1758de94e5da: 'Magic login testing' # Magic login testing
2eb44645-1260-46fe-9ca5-5f80e350f1b7: 'Magic login testing' # Magic login testing
plugins:
magic-login:
edition: standard
Expand All @@ -11,12 +19,6 @@ plugins:
system:
edition: pro
live: true
name: 'Craft test site'
schemaVersion: 5.3.0.2
timeZone: Europe/London
users:
allowPublicRegistration: true
defaultGroup: null
photoSubpath: null
photoVolumeUid: null
requireEmailVerification: false
name: 'Magic login testing'
schemaVersion: 5.6.0.2
timeZone: America/Los_Angeles
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: 'Magic login testing'

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
baseUrl: $PRIMARY_SITE_URL
enabled: true
handle: default
hasUrls: true
language: en-US
name: 'Magic login testing'
primary: true
siteGroup: 0ec9b1fd-034b-4a84-99af-1758de94e5da # Magic login testing
sortOrder: 1
5 changes: 4 additions & 1 deletion test-config/project/users/users.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
allowPublicRegistration: true
deactivateByDefault: false
defaultGroup: ''
photoSubpath: null
photoVolumeUid: null
require2fa: false
requireEmailVerification: false
suspendByDefault: false
validateOnPublicRegistration: false
1 change: 1 addition & 0 deletions tests/_bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

// Use the current installation of Craft
define('CRAFT_TESTS_PATH', __DIR__);
define('CRAFT_ROOT_PATH', dirname(__DIR__) . '/_craft');
define('CRAFT_STORAGE_PATH', __DIR__ . '/_craft/storage');
define('CRAFT_TEMPLATES_PATH', __DIR__ . '/_craft/templates');
define('CRAFT_CONFIG_PATH', __DIR__ . '/_craft/config');
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/RegistrationFormTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public function testUsersCanRegisterWithoutAPasswordToGetARandomOne()
$user = UserElement::find()
->addSelect(['users.password'])
->email($registrationEmail)
->anyStatus()
->status(null)
->one();

$this->assertTrue($user->authenticate($password));
Expand Down