@@ -32,3 +32,4 @@ xt/admin.db

 xt/admin

 xt/user.db

 xt/user

+xt/log

@@ -225,7 +225,7 @@ sub startup {

         $r->get('/network/graph/(*rev1)...(*rev2_abs)' => template '/network/graph');

         # Import branch

-        $r->any('/import-branch/(*remote_branch_abs)' => template '/import-branch');

+        $r->any('/import-branch/:remote_user/:remote_project' => template '/import-branch');

         # Get branches and tags

         $r->get('/api/revs' => template '/api/revs');

@@ -200,7 +200,7 @@ sub original_project {

     id => [$user, $project]

   )->one;

-  croak "No original project" unless $row;

+  croak "Original project don't eixsts." unless $row;

   # Original project

   my $original_project = $dbi->model('project')->select(

@@ -13,6 +13,7 @@

 % layout 'common';

   %= include '/include/header', title => 'Gitprep';

+  <!-- Index page -->

   <div class="container" style="min-heigth:500px">

     <h3>Users</h3>

     <ul class="nav nav-tabs nav-stacked">

@@ -4,15 +4,15 @@

   my $user = param('user');

   my $project = param('project');

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

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

+  my $remote_branch = param('remote-branch');

   # Authentication

   unless ($api->logined($user)) {

     $self->redirect_to('/');

     return;

   }

-

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

-  my ($remote_user, $remote_project, $remote_branch) = split /\//, $remote_branch_abs, 3;

   # Branches

   my $git = app->git;

@@ -42,7 +42,7 @@

       remote_project => [

         ['project_name' => 'Remote repository is invalid.']

       ],

-      remote_branch => [

+      'remote-branch' => [

         ['not_blank' => 'Remote branch name is empty.']

       ],

       force => {require => 0} => [

@@ -60,7 +60,7 @@

       my $branch = $safe_params->{branch};

       my $remote_user = $safe_params->{remote_user};

       my $remote_project = $safe_params->{remote_project};

-      my $remote_branch = $safe_params->{remote_branch};

+      my $remote_branch = $safe_params->{'remote-branch'};

       my $force = $safe_params->{force};

       # Check branch name

@@ -129,7 +129,7 @@

       </div>

     % }

     <h3>Import branch</h3>

-    <form action="<%= url_for->query(op => 'import') %>" method="post">

+    <form action="<%= url_for("/$user/$project/import-branch/$remote_user/$remote_project")->query(op => 'import') %>" method="post">

       <div class="row" style="font-size:22px">

         <div class="span6">

           <div class="well" style="text-align:center">

@@ -166,14 +166,10 @@

               %= "$remote_user / $remote_project";

             </div>

             % param(remote_branch => $remote_branch);

-            %= select_field 'remote_branch' => $remote_branch_names, style => "width:250px";

+            %= select_field 'remote-branch' => $remote_branch_names, style => "width:250px";

           </div>

         </div>

       </div>

-      %= hidden_field user => $user;

-      %= hidden_field project => $user;

-      %= hidden_field remote_user => $remote_user;

-      %= hidden_field remote_project => $remote_project;

     </form>

   </div>

@@ -12,6 +12,8 @@

         <div  style="margin-top:5px">

           <div>

             % my $user = session('user') || '';

+            <!-- Logined as <%= $user %> -->

+

             <i class="icon-user"></i><a href="<%= url_for("/$user") %>"><%= $user %></a>

           </div>

           % unless ($user eq 'admin') {

@@ -45,7 +45,7 @@

         var remote_branch = remote.find('[name=remote-branch]').val();

         location.href = '<%= url_for("/$user/$project/import-branch/") %>'

-          + remote_member + '/' + remote_project + '/' + remote_branch;

+          + remote_member + '/' + remote_project + '?remote-branch=' + remote_branch;

       });

     });

   % end

@@ -35,7 +35,7 @@ note 'Start page';

   my $app = Gitprep->new;

   my $t = Test::Mojo->new($app);

   $t->ua->max_redirects(3);

-

+  

   # Redirect to _start page

   $t->get_ok('/');

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

@@ -461,21 +461,68 @@ note 'Delete branch';

   $t->content_unlike(qr/tmp_branch/);

 }

-=pod

 note 'import-branch';

 {

   my $app = Gitprep->new;

   my $t = Test::Mojo->new($app);

   $t->ua->max_redirects(3);

-  # Login as kimoto

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

+  # Login as kimoto1

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

+  $t->get_ok('/')->content_like(qr/Logined as kimoto1 /);

   # Create project

-  $t->post_ok('/_new?op=create', form => {project => 'import-branch1', readme => 1});

-  $t->content_like(qr/import-branch1\.git/);

+  $t->post_ok('/_new?op=create', form => {project => 'import-branch1', description => '', readme => 1});

+  $t->get_ok('/kimoto1')->content_like(qr/import-branch1/);

+  # Login as kimoto2

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

+  $t->get_ok('/')->content_like(qr/Logined as kimoto2 /);

+

+  # Fork kimoto1/import-branch1

+  $t->get_ok("/kimoto1/import-branch1/fork");

+  $t->content_like(qr#Repository is forked from /kimoto1/import-branch1#);

+

+  # Access not valid user

+  $t->get_ok('/kimoto1/import-branch1/network');

+  $t->content_like(qr/Network/);

+  $t->content_unlike(qr/Import/);

+  $t->get_ok('/kimoto1/import-branch1/import-branch/kimoto2/import-branch1?remote-branch=master');

+  $t->content_like(qr/ Index page /);

+  

+  # Show network page import button

+  $t->get_ok('/kimoto2/import-branch1/network');

+  $t->content_like(qr/Network/);

+  $t->content_like(qr/Import/);

+  

+  # Import branch page access

+  $t->get_ok('/kimoto2/import-branch1/import-branch/kimoto1/import-branch1?remote-branch=master');

+  $t->content_like(qr/Import branch/);

+

+  # Invalid parameters

+  $t->post_ok('/kimoto2/import-branch1/import-branch/kimoto1/import-branch1?remote-branch=master&op=import');

+  $t->content_like(qr/Branch name is empty/);

-  $t->get_ok('/kimoto/gitprep_t/import-branch/kimoto1/gitprep_t/master');

+  # Import branch

+  $t->post_ok('/kimoto2/import-branch1/import-branch/kimoto1/import-branch1?op=import', form => {

+    branch => 'new1',

+    'remote-branch' => 'master'

+  });

+  $t->content_like(qr#Success: import#);

+  $t->get_ok('/kimoto2/import-branch1/branches')->content_like(qr/new1/);

+

+  # Import same name branch fail

+  $t->post_ok('/kimoto2/import-branch1/import-branch/kimoto1/import-branch1?op=import', form => {

+    branch => 'new1',

+    'remote-branch' => 'master'

+  });

+  $t->content_like(qr#already exists#);

+

+  # Import force

+  $t->post_ok('/kimoto2/import-branch1/import-branch/kimoto1/import-branch1?op=import', form => {

+    branch => 'new1',

+    'remote-branch' => 'master',

+    force => 1

+  });

+  $t->content_like(qr#Success: force import#);

 }

-=cut