kallithea Changeset - 9d1d00c72e61

Changeset - 9d1d00c72e61

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2020-01-07 12:41:33
mads@kiilerich.com

py3: fix error in template from introducing safe_unicode in 9203621cae03

Add missing test coverage of actual edit form.

2 files changed with 10 insertions and 1 deletions:

kallithea/templates/files/files_edit.html

kallithea/tests/functional/test_files.py

0 comments (0 inline, 0 general)

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -50,25 +50,25 @@ ${self.repo_context_bar('files')} @@
                     <span class="pull-right buttons">
                       ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       % if h.HasRepoPermissionLevel('write')(c.repo_name):
                        % if not c.file.is_binary:
                         ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                        % endif
                       % endif
                     </span>
               </div>
               <div class="panel-body no-padding">
                 <textarea id="editor" name="content" style="display:none">${h.escape(safe_unicode(c.file.content))|n}</textarea>
+                <textarea id="editor" name="content" style="display:none">${h.escape(h.safe_unicode(c.file.content))|n}</textarea>
               </div>
             </div>
             <div>
               <div class="form-group">
                   <label>${_('Commit Message')}</label>
                   <textarea class="form-control" id="commit" name="message" placeholder="${c.default_message}"></textarea>
               </div>
               <div class="form-group buttons">
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-success")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
               </div>
             </div>

kallithea/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -471,24 +471,33 @@ class TestFilesController(TestController @@
         try:
             self.checkSessionFlash(response, 'Successfully committed to %s'
                                    % posixpath.join(location, filename))
         finally:
             fixture.destroy_repo(repo.repo_name)
     # Hg - EDIT
     def test_edit_file_view_hg(self):
         self.log_user()
         response = self.app.get(url('files_edit_home',
                                       repo_name=HG_REPO,
                                       revision='tip', f_path='vcs/nodes.py'))
         # Odd error when on tip ...
         self.checkSessionFlash(response, "You can only edit files with revision being a valid branch")
         assert "Commit Message" not in response.body
         # Specify branch head revision to avoid "valid branch" error and get coverage of edit form
         response = self.app.get(url('files_edit_home',
                                       repo_name=HG_REPO,
                                       revision='96507bd11ecc815ebc6270fdf6db110928c09c1e', f_path='vcs/nodes.py'))
         assert "Commit Message" in response.body
     def test_edit_file_view_not_on_branch_hg(self):
         self.log_user()
         repo = fixture.create_repo(u'test-edit-repo', repo_type='hg')
         ## add file
         location = 'vcs'
         filename = 'nodes.py'
         response = self.app.post(url('files_add_home',
                                       repo_name=repo.repo_name,
                                       revision='tip', f_path='/'),
                                  params={

0 comments (0 inline, 0 general)