Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Entry field and test fixed

Browse source
This commit is contained in:
Finn 2017-08-24 12:48:32 +01:00
parent db45f710c3
commit 7c25ecccfd
2 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
t/admin/user.t
View file

@ -51,15 +51,43 @@ $t->post_ok('/admin', form => {
})->status_is(200); })->status_is(200);
#Read customer user #Read customer user
$t->get_ok('/admin/users/1/')
->status_is(200);
#Read organisation user
$t->get_ok('/admin/users/2/') $t->get_ok('/admin/users/2/')
->status_is(200); ->status_is(200);
#Read organisation user
$t->get_ok('/admin/users/3/')
->status_is(200);
#Valid customer user update
$t->post_ok('/admin/users/2/edit', form => {
email => 'test12@example.com',
new_password => 'abc123',
full_name => 'Test User1',
display_name => 'Test User1',
town => 'Midgar',
postcode => 'WC1E 6AD',
})->status_is(200)->content_like(qr/Updated User/);
#Failed validation on customer user from no postcode
$t->post_ok('/admin/users/2/edit', form => {
email => 'test12@example.com',
new_password => 'abc123',
full_name => 'Test User1',
display_name => 'Test User1',
town => 'Midgar',
})->content_like(qr/The validation has failed/);
#Failed validation on customer user from no display name
$t->post_ok('/admin/users/2/edit', form => {
email => 'test12@example.com',
new_password => 'abc123',
full_name => 'Test User1',
town => 'Midgar',
postcode => 'WC1E 6AD',
})->content_like(qr/The validation has failed/);
#Valid organisation user update #Valid organisation user update
$t->post_ok('/admin/users/1/edit', form => { $t->post_ok('/admin/users/3/edit', form => {
email => 'test51@example.com', email => 'test51@example.com',
new_password => 'abc123', new_password => 'abc123',
name => '7th Heaven', name => '7th Heaven',
@ -68,18 +96,8 @@ $t->post_ok('/admin/users/1/edit', form => {
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->status_is(200)->content_like(qr/Updated User/); })->status_is(200)->content_like(qr/Updated User/);
#Failed validation on organisation user from wrong email
$t->post_ok('/admin/users/1/edit', form => {
email => 'test55@example.com',
new_password => 'abc123',
name => '7th Heaven',
street_name => 'Slums, Sector 7',
town => 'Midgar',
postcode => 'WC1E 6AD',
})->content_like(qr/The validation has failed/);
#Failed validation on organisation user from no postcode #Failed validation on organisation user from no postcode
$t->post_ok('/admin/users/1/edit', form => { $t->post_ok('/admin/users/3/edit', form => {
email => 'test50@example.com', email => 'test50@example.com',
new_password => 'abc123', new_password => 'abc123',
name => '7th Heaven', name => '7th Heaven',
@ -88,7 +106,7 @@ $t->post_ok('/admin/users/1/edit', form => {
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);
#Failed validation on organisation user from no street name #Failed validation on organisation user from no street name
$t->post_ok('/admin/users/1/edit', form => { $t->post_ok('/admin/users/3/edit', form => {
email => 'test50@example.com', email => 'test50@example.com',
new_password => 'abc123', new_password => 'abc123',
name => '7th Heaven', name => '7th Heaven',

2
templates/admin/users/read.html.ep
View file

@ -49,7 +49,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="year_of_birth">Year of Birth</label> <label for="year_of_birth">Year of Birth</label>
<input id="year_of_birth" type="number" class="form-control" placeholder="Year of Birth" name="year_of_birth" value="<%= $customer_rs->year_of_birth %>"> <input id="year_of_birth" type="number" class="form-control" placeholder="Year of Birth" name="year_of_birth" value="<%= $customer_rs->year_of_birth %>" disabled>
</div> </div>
% } elsif ( my $org_rs = $user->organisation ) { % } elsif ( my $org_rs = $user->organisation ) {
<h3 class="card-header"> <h3 class="card-header">