Revert "Merge pull request #350 from blmarket/pageauthor"

This reverts commit 5d3571b7a3, reversing
changes made to c1082b4474.
This commit is contained in:
bootstraponline
2012-05-21 17:09:15 -06:00
parent 5d3571b7a3
commit c7984ceed1
2 changed files with 5 additions and 21 deletions
+4 -4
View File
@@ -14,13 +14,13 @@ module Precious
end
def author
return DEFAULT_AUTHOR if @page.versions.empty?
@page.versions[0].author.name
return DEFAULT_AUTHOR unless @page.version
@page.version.author.name
end
def date
return Time.now.strftime(DATE_FORMAT) if @page.versions.empty?
@page.versions[0].authored_date.strftime(DATE_FORMAT)
return Time.now.strftime(DATE_FORMAT) unless @page.version
@page.version.authored_date.strftime(DATE_FORMAT)
end
def editable
+1 -17
View File
@@ -15,23 +15,7 @@ context "Frontend" do
FileUtils.rm_rf(@path)
end
test "committer remains same if page didn't modified" do
@wiki.write_page('CC', :markdown, 'asdf',
{ :name => "asdf", :email => "news@nomail.com" });
get '/CC'
assert_match /Last edited by <b>asdf/, last_response.body
@wiki.write_page('DD', :markdown, 'asdf',
{ :name => "news", :email => "asdf@nomail.com" });
get '/DD'
assert_match /Last edited by <b>news/, last_response.body
get '/CC'
assert_match /Last edited by <b>asdf/, last_response.body
end
test "edits page" do
test "edits page" do
page_1 = @wiki.page('A')
post "/edit/A", :content => 'abc',
:format => page_1.format, :message => 'def'