diff --git a/framework/core/.gitattributes b/framework/core/.gitattributes new file mode 100644 index 000000000..71b028f4d --- /dev/null +++ b/framework/core/.gitattributes @@ -0,0 +1,20 @@ +**/.gitattributes export-ignore +**/.gitignore export-ignore +**/.gitmodules export-ignore +**/.github export-ignore +**/.travis export-ignore +**/.travis.yml export-ignore +**/.editorconfig export-ignore +**/.styleci.yml export-ignore + +**/phpunit.xml export-ignore +**/tests export-ignore + +**/js/dist/**/* -diff +**/js/dist/**/* linguist-generated +**/js/dist-typings/**/* -diff +**/js/dist-typings/**/* linguist-generated +**/js/yarn.lock -diff +**/js/package-lock.json -diff + +* text=auto eol=lf diff --git a/framework/core/tests/fixtures/assets/avatar.gif b/framework/core/tests/fixtures/assets/avatar.gif new file mode 100644 index 000000000..e4c576780 Binary files /dev/null and b/framework/core/tests/fixtures/assets/avatar.gif differ diff --git a/framework/core/tests/fixtures/assets/avatar.jpg b/framework/core/tests/fixtures/assets/avatar.jpg new file mode 100644 index 000000000..29384c0e1 Binary files /dev/null and b/framework/core/tests/fixtures/assets/avatar.jpg differ diff --git a/framework/core/tests/fixtures/assets/avatar.png b/framework/core/tests/fixtures/assets/avatar.png new file mode 100644 index 000000000..371011bff Binary files /dev/null and b/framework/core/tests/fixtures/assets/avatar.png differ diff --git a/framework/core/tests/integration/api/users/CreateTest.php b/framework/core/tests/integration/api/users/CreateTest.php index 85c358ab8..8c0429291 100644 --- a/framework/core/tests/integration/api/users/CreateTest.php +++ b/framework/core/tests/integration/api/users/CreateTest.php @@ -325,28 +325,28 @@ class CreateTest extends TestCase 'username' => 'test1', 'email' => 'test1@machine.local', 'is_email_confirmed' => 1, - 'avatar_url' => 'https://via.placeholder.com/150.png' + 'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png' ], []); $regTokens[] = RegistrationToken::generate('flarum', '2', [ 'username' => 'test2', 'email' => 'test2@machine.local', 'is_email_confirmed' => 1, - 'avatar_url' => 'https://via.placeholder.com/150.jpg' + 'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.jpg' ], []); $regTokens[] = RegistrationToken::generate('flarum', '3', [ 'username' => 'test3', 'email' => 'test3@machine.local', 'is_email_confirmed' => 1, - 'avatar_url' => 'https://via.placeholder.com/150.gif' + 'avatar_url' => 'https://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.gif' ], []); $regTokens[] = RegistrationToken::generate('flarum', '4', [ 'username' => 'test4', 'email' => 'test4@machine.local', 'is_email_confirmed' => 1, - 'avatar_url' => 'http://via.placeholder.com/150.png' + 'avatar_url' => 'http://raw.githubusercontent.com/flarum/framework/main/framework/core/tests/fixtures/assets/avatar.png' ], []); /**