16849.patch

Takenori TAKAKI, 2021-05-14 03:50

Download (3.08 KB)

View differences:

app/views/repositories/entry.html.erb
10 10

  
11 11
<% if Redmine::MimeType.is_type?('image', @path) %>
12 12
  <%= render :partial => 'common/image', :locals => {:path => @raw_url, :alt => @path} %>
13
<% elsif Redmine::MimeType.of(@path) == 'text/x-textile' %>
14
  <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'textile', :markup_text => @content} %>
15
<% elsif Redmine::MimeType.of(@path) == 'text/markdown' %>
16
  <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'markdown', :markup_text => @content} %>
13 17
<% elsif @content %>
14 18
  <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
15 19
<% else %>
test/functional/repositories_subversion_controller_test.rb
27 27
           :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
28 28

  
29 29
  PRJ_ID = 3
30
  NUM_REV = 12
30
  NUM_REV = 13
31 31

  
32 32
  def setup
33 33
    super
......
204 204
      )
205 205
      assert_response :success
206 206
      assert_select 'table.changesets tbody' do
207
        assert_select 'tr', 7
207
        assert_select 'tr', 8
208
        assert_select 'tr td.id a', :text => '13'
208 209
        assert_select 'tr td.id a', :text => '12'
209 210
        assert_select 'tr td.id a', :text => '10'
210 211
        assert_select 'tr td.id a', :text => '9'
......
280 281
      assert_select 'audio[src=?]', "/projects/subproject1/repository/#{@repository.id}/raw/subversion_test/folder/subfolder/chords.mp3"
281 282
    end
282 283

  
284
    def text_entry_should_preview_markdown
285
      get(
286
        :entry,
287
        :params => {
288
          :id => PRJ_ID,
289
          :repository_id => @repository.id,
290
          :path => repository_path_hash(['subversion_test', 'folder', 'subfolder', 'testfile.md'])[:param]
291
        }
292
      )
293
      assert_response :success
294
      assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n\n<h2>Header 2</h2>\n\n<h3>Header 3</h3>"
295
    end
296

  
297
    def text_entry_should_preview_textile
298
      get(
299
        :entry,
300
        :params => {
301
          :id => PRJ_ID,
302
          :repository_id => @repository.id,
303
          :path => repository_path_hash(['subversion_test', 'folder', 'subfolder', 'testfile.textile'])[:param]
304
        }
305
      )
306
      assert_response :success
307
      assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n\n\n\t<h2>Header 2</h2>\n\n\n\t<h3>Header 3</h3>"
308
    end
309

  
283 310
    def test_entry_at_given_revision
284 311
      assert_equal 0, @repository.changesets.count
285 312
      @repository.fetch_changesets