@@ -9,7 +9,7 @@

     # Parameters

     my $id = param('id');

     my $name = param('name');

-    my $mail = param('mail');

+    my $email = param('email');

     my $password = param('password');

     my $password2 = param('password2');

@@ -39,17 +39,17 @@

     # "name" check

     $name //= '';

-    # "mail" check

-    if (!(defined $mail && length $mail)) {

-      $validation->add_failed(mail => "Mail must be not empty");

+    # "email" check

+    if (!(defined $email && length $email)) {

+      $validation->add_failed(email => "Mail must be not empty");

     }

-    elsif ($mail !~ /\@/) {

-      $validation->add_failed(mail => "Invalid mail address");

+    elsif ($email !~ /\@/) {

+      $validation->add_failed(email => "Invalid mail address");

     }

     else {

-      my $row = app->dbi->model('user')->select(where => {mail => $mail})->one;

+      my $row = app->dbi->model('user')->select(where => {email => $email})->one;

       if ($row) {

-        $validation->add_failed(mail => "Mail $mail already exists");

+        $validation->add_failed(email => "Mail $email already exists");

       }

     }

@@ -73,7 +73,7 @@

       $params->{password} = $password_encrypted;

       $params->{salt} = $salt;

       $params->{name} = $name;

-      $params->{mail} = $mail;

+      $params->{email} = $email;

       # Create user

       eval { app->manager->create_user($id, $params) };

@@ -131,7 +131,7 @@

         <div>

           <div>Mail</div>

           <div>

-            <%= text_field 'mail', placeholder => 'Mail' %>

+            <%= text_field 'email', placeholder => 'Mail' %>

           </div>

         </div>

         <div>

@@ -10,7 +10,7 @@

     # Parameters

     my $id = param('id');

     my $name = param('name');

-    my $mail = param('mail');

+    my $email = param('email');

     # Validator

     my $vc = app->vc;

@@ -26,22 +26,22 @@

     # "name" check

     $name //= '';

-    # "mail" check

-    if (!(defined $mail && length $mail)) {

-      $validation->add_failed(mail => "Mail must be not empty");

+    # "email" check

+    if (!(defined $email && length $email)) {

+      $validation->add_failed(email => "Mail must be not empty");

     }

-    elsif ($mail !~ /\@/) {

-      $validation->add_failed(mail => "Invalid mail address");

+    elsif ($email !~ /\@/) {

+      $validation->add_failed(email => "Invalid mail address");

     }

     else {

       my $where = app->dbi->where;

       my $clause = [

         'and',

-        ':mail{=}',

+        ':email{=}',

         ':id{<>}'

       ];

       my $param = {

-        mail => $mail,

+        email => $email,

         id => $user_id

       };

       $where->clause($clause);

@@ -49,7 +49,7 @@

       my $row = app->dbi->model('user')->select(where => $where)->one;

       if ($row) {

-        $validation->add_failed(mail => "Mail $mail already exists");

+        $validation->add_failed(email => "Mail $email already exists");

       }

     }

@@ -58,7 +58,7 @@

       # Encrypt password

       my $params = {};

       $params->{name} = $name;

-      $params->{mail} = $mail;

+      $params->{email} = $email;

       # Update user

       eval { app->dbi->model('user')->update($params, where => {id => $id}) };

@@ -121,7 +121,7 @@

         <div>

           <div><b>Mail</b></div>

           <div>

-            <%= text_field 'mail' => $user->{mail}, placeholder => 'Mail' %>

+            <%= text_field 'email' => $user->{email}, placeholder => 'Mail' %>

           </div>

         </div>

         <div>

@@ -44,7 +44,7 @@ note 'import_rep';

   $t->content_like(qr/Admin/);

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', email => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Import repositories

@@ -45,7 +45,7 @@ note 'Smart HTTP';

   $t->content_like(qr/Admin/);

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', email => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Login as kimoto

@@ -155,9 +155,9 @@ note 'Private repository and collaborator';

   $t->content_like(qr/Admin/);

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', email => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', mail => 'kimoto2@foo.com', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', email => 'kimoto2@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Login as kimoto

@@ -132,7 +132,7 @@ note 'Admin page';

     $t->content_like(qr/Two password/);

     # Create user

-    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', name => 'Kimoto', mail => 'kimoto@gitprep.example', password => 'a', password2 => 'a'});

+    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', name => 'Kimoto', email => 'kimoto@gitprep.example', password => 'a', password2 => 'a'});

     $t->content_like(qr/Success.*created/);

   }

@@ -170,11 +170,11 @@ note 'Admin page';

   note 'Admin page - Update user';

   {

     # Create user

-    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto-update', name => 'Kimoto-Update', mail => 'kimoto-update@gitprep.example', password => 'a', password2 => 'a'});

+    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto-update', name => 'Kimoto-Update', email => 'kimoto-update@gitprep.example', password => 'a', password2 => 'a'});

     $t->content_like(qr/kimoto-update/);

     # Update user

-    $t->post_ok('/_admin/user/update?op=update', form => {id => 'kimoto-update', name => 'Kimoto-Update2', mail => 'kimoto-update2@gitprep.example'});

+    $t->post_ok('/_admin/user/update?op=update', form => {id => 'kimoto-update', name => 'Kimoto-Update2', email => 'kimoto-update2@gitprep.example'});

     $t->content_like(qr/Kimoto-Update2/);

     $t->content_like(qr/kimoto-update2\@gitprep\.example/);

   }

@@ -182,7 +182,7 @@ note 'Admin page';

   note 'Admin page - Delete user';

   {

     # Create user

-    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto-tmp', mail => 'kimoto-tmp@gitprep.example', password => 'a', password2 => 'a'});

+    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto-tmp', email => 'kimoto-tmp@gitprep.example', password => 'a', password2 => 'a'});

     $t->content_like(qr/kimoto-tmp/);

     $t->get_ok('/_admin/users');

     $t->content_like(qr/kimoto-tmp/);

@@ -235,9 +235,9 @@ note 'Reset password';

   $t->content_like(qr/Admin/);

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto1', mail => 'kimoto1@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto1', email => 'kimoto1@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/kimoto1/);

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', mail => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', email => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/kimoto2/);

   # Logout

@@ -283,9 +283,9 @@ note 'Profile';

   $t->post_ok('/_login?op=login', form => {id => 'admin', password => 'a'});

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto1', mail => 'kimoto1@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto1', email => 'kimoto1@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/kimoto1/);

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', mail => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', email => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/kimoto2/);

   # Login as kimoto1

@@ -394,7 +394,7 @@ note 'Profile';

       $t->content_like(qr/Settings is saved/);

       my $changed = $t->app->dbi->model('project')->select(

         'default_branch',

-        where => {user_id => 'kimoto1', name => 't2'}

+        where => {user => $app->gitprep_api->get_user_row_id('kimoto1'), id => 't2'}

       )->value;

       is($changed, 'b1');

     }

@@ -578,9 +578,9 @@ note 'Private repository and collaborator';

   $t->content_like(qr/Admin/);

   # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', email => 'kimoto@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', mail => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', email => 'kimoto2@gitprep.example', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Login as kimoto

@@ -596,7 +596,7 @@ note 'Private repository and collaborator';

   $t->content_like(qr/Settings is saved/);

   my $is_private = $t->app->dbi->model('project')->select(

     'private',

-    where => {user_id => 'kimoto', name => 't1'}

+    where => {user => $app->gitprep_api->get_user_row_id('kimoto'), id => 't1'}

   )->value;

   is($is_private, 1);