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

Jump to bottom

263 show current users #330

Merged
merged 45 commits into from
Jul 25, 2019
Merged

263 show current users #330

merged 45 commits into from
Jul 25, 2019

Conversation

acsauk-mojd
Copy link
Contributor

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Issues Resolved

#263

Merge check List

  • New functionality includes testing
  • New functionality has been documented in the README if applicable
  • Approved by Sean

acsauk added 30 commits July 8, 2019 17:08
@acsauk
creates UserTestHelper and uses in createTestUser, adds outline of fi…
1e10c79 
…rst test for viewing users
@acsauk
displays all users email addresses on users/view
8add449
@acsauk
updates entity mappings for User to include created_at and last_login…
31647bf 
…_at and generates migrtation. Converts some test helpers to static methods.
@acsauk
adds functional test to cover lastLoginAt is updated on successful login
9468768
@acsauk
guards against a string representation of a User being returned in ev…
283dc7a 
…entListener, adds HTTP method to users/view for clarity
@acsauk
adds NOTIFICATION_API_KEY to phpunit env vars
e291106
@acsauk
adds notify mock to test services
7948df6
@acsauk
phpunit build debug
a8098f9
@acsauk
phpunit debug
8029881
@acsauk
phpunit build debug
40777a0
@acsauk
uses phpunit in app rather than from an image
cad5791
@acsauk
more phpunit build debugging
2dceb5c
@acsauk
revert to using phpunit docker-compose service
c080d3e
@acsauk
try schema creation and migration during phpunit test run
7a11cc7
@acsauk
phpunit build debug
70c4c1f
@acsauk
add migrations to build
710105e
@acsauk
debug
0bde824
@acsauk
deeeebug
46168db
@acsauk
switch yo using simple-phpunit
f03a86c
@acsauk
debug phpunit build
3ffa538
@acsauk
revert config.yml to use phpunit docker-compose service
2000134
@acsauk
more debug for build process testing
ea0a290
@acsauk
adds docker-compose.test.yml
5011911
@acsauk
generates certs in circle flow
4511a96
@acsauk
moves phpunit test to main build step
f42ce8c
@acsauk
passes test dockerfile
4b17ba1
@acsauk
revert circleci step
9b6f6a8
@acsauk
drops schema create step from app Dockerfile
c8dcb88
@acsauk
moves to sqlite db for tests
c9109ff
@acsauk
adds test schema create to build steps
e93bef7
acsauk added 15 commits July 10, 2019 17:17
@acsauk
specifies APP_ENV=test for running test in circle build
bb89d9e
@acsauk
excepts var/test from gitignore
37af684
@acsauk
try exec
45724b9
@acsauk
add project prefix to container name
8284d89
@acsauk
tidies up view to use tabluar formatting, adds assertion to test
fb70cf6
@acsauk
switches to using test docker-compose file during test build phase
c9dbe55
@acsauk
Merge branch 'master' into 263-show-current-users
0fca9f7
@acsauk
updates test steps to run unit tests
49b6ab1
@acsauk
drops panther env vars from docker-compose.test as we arent currently…
5fe9af4 
… using it
@acsauk
fixes setUp return type
209317b
@acsauk
drops sqlite test setup, updates assertions for phpunit 8 compatability
1b935a1
@acsauk
drops volume for var/test
2bfa840
@acsauk
reverts .gitignore as no longer using sqlite, updates packages, drops…
6307818 
… print from UserControllerTest
@acsauk
newlines
2cb9ad6
@acsauk
newlines
4ecc2ac
@acsauk-mojd acsauk-mojd requested a review from a team as a code owner July 24, 2019 15:15
@acsauk-mojd acsauk-mojd merged commit 32052f5 into master Jul 25, 2019
@acsauk-mojd acsauk-mojd deleted the 263-show-current-users branch July 25, 2019 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomTucka TomTucka TomTucka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@acsauk-mojd @TomTucka @acsauk