Skip to content

Commit

Permalink
Add reset password
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchalamon committed May 19, 2020
1 parent 1c94abb commit 5e98f09
Show file tree
Hide file tree
Showing 28 changed files with 866 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ APP_SECRET=782bb8b0aeb47de4ea870794e79d82cd
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
DATABASE_URL=postgresql://resop:postgrespwd@postgres/resop?serverVersion=11&charset=utf8
###< doctrine/doctrine-bundle ###

###> symfony/mailer ###
MAILER_DSN=smtp://mailcatcher:25
###< symfony/mailer ###
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:
APP_DEBUG: 0
DATABASE_SERVER_VERSION: 11 # update service "postgresql" if this value change
PANTHER_CHROME_DRIVER_BINARY: /usr/bin/chromedriver
MAILER_DSN: smtp://localhost:25

jobs:
php:
Expand All @@ -32,6 +33,11 @@ jobs:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
mailcatcher:
image: tophfr/mailcatcher:0.6.5
ports:
- 1080:80
- 1025:25

steps:
- name: set DATABASE_URL environment variable
Expand Down Expand Up @@ -131,6 +137,7 @@ jobs:
- name: Run Behat tests
run: |
bin/post-install-test.sh
sed -i 's#http://mailcatcher#http://localhost:1080#' behat.yml.dist
vendor/bin/behat --format=progress --out=std --format=junit --out=var/behat --tags '~@javascript'
if: always()

Expand Down
9 changes: 7 additions & 2 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@ default:
suites:
default:
contexts:
- Alex\MailCatcher\Behat\MailCatcherContext
- App\Tests\Behat\CoverageContext
- App\Tests\Behat\DatabaseContext
- App\Tests\Behat\FixturesContext
- App\Tests\Behat\OrganizationPlanningContext
- App\Tests\Behat\ResetPasswordContext
- App\Tests\Behat\SecurityContext
- App\Tests\Behat\TraversingContext
- App\Tests\Behat\UserPlanningContext
- Behat\MinkExtension\Context\MinkContext
- PantherExtension\Context\PantherContext
- PantherExtension\Context\WaitContext:
- PantherExtension\Context\WaitContext
extensions:
PantherExtension\Extension\PantherExtension: ~
Alex\MailCatcher\Behat\MailCatcherExtension\Extension:
url: http://mailcatcher
purge_before_scenario: true
Behat\MinkExtension:
browser_name: chrome
default_session: symfony
Expand All @@ -28,3 +32,4 @@ default:
kernel:
environment: test
debug: true
PantherExtension\Extension\PantherExtension: ~
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"symfony/form": "5.*",
"symfony/framework-bundle": "5.*",
"symfony/intl": "5.*",
"symfony/mailer": "5.0.*",
"symfony/monolog-bundle": "^3.5",
"symfony/orm-pack": "^1.0",
"symfony/security-bundle": "5.0.*",
Expand All @@ -32,10 +33,12 @@
"symfony/validator": "5.*",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/yaml": "5.*",
"symfonycasts/reset-password-bundle": "^1.1",
"twig/cache-extension": "^1.4",
"twig/intl-extra": "^3.0"
},
"require-dev": {
"alexandresalome/mailcatcher": "dev-master",
"behat/behat": "^3.6",
"dama/doctrine-test-bundle": "^6.3",
"escapestudios/symfony2-coding-standard": "^3.11",
Expand Down
238 changes: 231 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@
Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
];
Loading

0 comments on commit 5e98f09

Please sign in to comment.