wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #994 from repotag/kramdown

Browse Source 
Move to Kramdown and support JRuby
This commit is contained in:
Dawa Ometto
2015-04-11 11:07:34 +02:00
parent ec0e1bf26f 80854584bb
commit a51bc4427a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1
View File
@@ -3,6 +3,7 @@ rvm:
- 2.0.0 - 2.0.0
- 2.1.0 - 2.1.0
- 2.1.1 - 2.1.1
- jruby-19mode
before_install: before_install:
- sudo apt-get update - sudo apt-get update
- sudo apt-get install libicu-dev - sudo apt-get install libicu-dev
gollum.gemspec
+1 -1
View File
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.extra_rdoc_files = %w[README.md LICENSE] s.extra_rdoc_files = %w[README.md LICENSE]
s.add_dependency 'gollum-lib', '~> 4.0', '>= 4.0.1' s.add_dependency 'gollum-lib', '~> 4.0', '>= 4.0.1'
s.add_dependency 'github-markdown', '~> 0.6.5' s.add_dependency 'kramdown', '~> 1.6.0'
s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4' s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0'] s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
s.add_dependency 'useragent', '~> 0.10.0' s.add_dependency 'useragent', '~> 0.10.0'
test/test_app.rb
+1 -3
View File
@@ -77,8 +77,7 @@ context "Frontend" do
{ :name => 'user1', :email => 'user1' }); { :name => 'user1', :email => 'user1' });
get page get page
expected = "<h2><a class=\"anchor\" (href|id)=\"(#)?#{text}\" (href|id)=\"(#)?#{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
expected = "<h2><a class=\"anchor\" id=\"#{text}\" href=\"##{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
actual = nfd(last_response.body) actual = nfd(last_response.body)
assert_match /#{expected}/, actual assert_match /#{expected}/, actual
@@ -409,7 +408,6 @@ context "Frontend" do
@wiki = Gollum::Wiki.new(@path) @wiki = Gollum::Wiki.new(@path)
Precious::App.set(:gollum_path, @path) Precious::App.set(:gollum_path, @path)
Precious::App.set(:wiki_options, {}) Precious::App.set(:wiki_options, {})
post "/preview", :content => 'abc', :format => 'markdown' post "/preview", :content => 'abc', :format => 'markdown'
assert last_response.ok? assert last_response.ok?
end end