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

Clean up tests. Remove templates

Browse Source
This commit is contained in:
bootstraponline
2014-04-05 12:46:41 -04:00
parent a7a1c4f81e
commit 452d825e66
6 changed files with 66 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/formatting.html
-92
View File
@@ -1,92 +0,0 @@
<style>
div.frame {
margin: 1em 0;
}
div.frame div {
display: inline-block;
border: 1px solid #aaa;
padding: 4px;
}
div div p {
font-size: 9px;
margin: 0;
padding: 4px 0 0 0;
text-align: center;
}
.float-left {
float: left;
padding-right: 1em;
}
.float-right {
float: right;
padding-left: 1em;
}
.align-left {
text-align: left;
}
.align-center {
text-align: center;
}
.align-right {
text-align: right;
}
</style>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. <img src="http://www.google.com/images/nav_logo8.png" style="max-width: 16px;" /> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante.
<div class="frame float-left">
<div>
<img src="http://www.google.com/images/nav_logo8.png" style="max-width: 100px;" />
<p>Google</p>
</div>
</div>
Fusce ullamcorper orci enim. Duis lectus elit, convallis ac convallis sit amet, euismod imperdiet dolor. Nunc egestas nisi quis magna feugiat vitae fringilla elit fermentum.
<div class="frame float-right">
<div>
<img src="http://www.google.com/images/nav_logo8.png" style="max-width: 100px;" />
<p>Google</p>
</div>
</div>
Vivamus sollicitudin dolor sit amet elit mollis ultricies. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas hendrerit eros felis. Nunc non enim at dolor malesuada pellentesque a quis nibh. Aliquam sit amet pretium ante.<p>
<div class="frame align-left">
<div>
<img src="http://www.google.com/images/nav_logo8.png" />
<p>Google</p>
</div>
</div>
<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>
<div class="frame align-center">
<div>
<img src="http://www.google.com/images/nav_logo8.png" />
<p>Google</p>
</div>
</div>
<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>
<p>
<div class="frame align-right">
<div>
<img src="http://www.google.com/images/nav_logo8.png" />
</div>
</div>
</p>
<p>Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies. <div class="frame align-right">
<div>
<img src="http://www.google.com/images/nav_logo8.png" />
</div>
</div> Phasellus porta dignissim leo vel hendrerit. Nulla pellentesque nisi ac nunc malesuada aliquam. Nullam et cursus augue. Sed rhoncus pharetra odio, vel dictum diam facilisis et. Etiam molestie justo ut purus elementum rhoncus. Fusce nec augue lectus. Proin a nisl ac lectus facilisis tempus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent blandit tempus libero, in interdum odio dignissim quis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec quis arcu a metus tincidunt scelerisque eget sed mauris. Nullam pellentesque faucibus sodales. Integer ullamcorper enim id nibh tempor ultricies.</p>
templates/helper_wiki.rb
-10
View File
@@ -1,10 +0,0 @@
class WikiFactory
def self.create p
examples = testpath "examples"
path = File.join(examples, "test.git")
FileUtils.cp_r File.join(examples, "empty.git"), path, :remove_destination => true
Gollum::Wiki.default_options = {:universal_toc => false}
cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
Gollum::Wiki.new(@path), @path, cleanup
end
end
test/helper.rb
+17 -5
View File
@@ -64,14 +64,26 @@ def context(*args, &block)
require 'test/unit' require 'test/unit'
klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
def self.test(name, &block) def self.test(name, &block)
define_method("test_#{name.gsub(/\W/,'_')}", &block) if block define_method("test_#{name.gsub(/\W/, '_')}", &block) if block
end end
def self.xtest(*args) end
def self.setup(&block) define_method(:setup, &block) end def self.xtest(*args)
def self.teardown(&block) define_method(:teardown, &block) end
end end
(class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
def self.setup(&block)
define_method(:setup, &block)
end
def self.teardown(&block)
define_method(:teardown, &block)
end
end
(
class << klass;
self
end).send(:define_method, :name) { name.gsub(/\W/, '_') }
$contexts << klass $contexts << klass
klass.class_eval &block klass.class_eval &block
end end
$contexts = [] $contexts = []
test/test_app.rb
+2 -2
View File
@@ -316,14 +316,14 @@ context "Frontend" do
end end
test "create sets the correct path for a relative path subdirectory with the page file directory set" do test "create sets the correct path for a relative path subdirectory with the page file directory set" do
Precious::App.set(:wiki_options, {:page_file_dir => "foo"}) Precious::App.set(:wiki_options, { :page_file_dir => "foo" })
dir = "bardir" dir = "bardir"
name = "#{dir}/baz" name = "#{dir}/baz"
get "/create/foo/#{name}" get "/create/foo/#{name}"
assert_match(/\/#{dir}/, last_response.body) assert_match(/\/#{dir}/, last_response.body)
assert_no_match(/[^\/]#{dir}/, last_response.body) assert_no_match(/[^\/]#{dir}/, last_response.body)
# reset page_file_dir # reset page_file_dir
Precious::App.set(:wiki_options, {:page_file_dir => nil}) Precious::App.set(:wiki_options, { :page_file_dir => nil })
end end
test "edit returns nil for non-existant page" do test "edit returns nil for non-existant page" do
test/test_unicode.rb
+1 -1
View File
@@ -91,7 +91,7 @@ context "Frontend Unicode support" do
test 'transliteration' do test 'transliteration' do
# TODO: Remove to_url once write_page changes are merged. # TODO: Remove to_url once write_page changes are merged.
@wiki.write_page('ééééé'.to_url, :markdown, '한글 text', { :name => '', :email => '' } ) @wiki.write_page('ééééé'.to_url, :markdown, '한글 text', { :name => '', :email => '' })
page = @wiki.page('eeeee') page = @wiki.page('eeeee')
assert_equal '한글 text', utf8(page.raw_data) assert_equal '한글 text', utf8(page.raw_data)
end end