From 3255709399086e7c7c942d94467ab9541ab113da Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Sat, 21 Jul 2012 16:52:18 -0600 Subject: [PATCH] Don't mess with the commit message. --- lib/gollum/frontend/app.rb | 3 +-- test/test_app.rb | 8 ++++---- test/test_unicode.rb | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb index f6c00497..a237dad3 100644 --- a/lib/gollum/frontend/app.rb +++ b/lib/gollum/frontend/app.rb @@ -126,7 +126,6 @@ module Precious page = wiki.page(CGI.unescape(params[:page])) name = params[:rename] || page.name msg = commit_message - msg[:message]= msg[:message] + " [#{page.version_short}]" committer = Gollum::Committer.new(wiki, msg) commit = {:committer => committer} @@ -147,7 +146,7 @@ module Precious wiki_options = settings.wiki_options.merge({ :page_file_dir => @path }) wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) @page = wiki.page(@name) - wiki.delete_page(@page, { :message => "Destroyed #{@name} (#{@page.format}) [#{@page.version_short}]" }) + wiki.delete_page(@page, { :message => "Destroyed #{@name} (#{@page.format})" }) redirect '/' end diff --git a/test/test_app.rb b/test/test_app.rb index 5737da42..e4d2d875 100644 --- a/test/test_app.rb +++ b/test/test_app.rb @@ -46,7 +46,7 @@ context "Frontend" do @wiki.clear_cache page_2 = @wiki.page(page_1.name) assert_equal 'abc', page_2.raw_data - assert_equal 'def [ed6c9f6]', page_2.version.message + assert_equal 'def', page_2.version.message assert_not_equal page_1.version.sha, page_2.version.sha end @@ -72,12 +72,12 @@ context "Frontend" do assert_equal 'header', header_2.raw_data assert_equal 'footer', foot_2.raw_data - assert_equal 'def [ed6c9f6]', foot_2.version.message + assert_equal 'def', foot_2.version.message assert_not_equal foot_1.version.sha, foot_2.version.sha assert_not_equal header_1.version.sha, header_2.version.sha assert_equal 'sidebar', side_2.raw_data - assert_equal 'def [ed6c9f6]', side_2.version.message + assert_equal 'def', side_2.version.message assert_not_equal side_1.version.sha, side_2.version.sha assert_equal commits+1, @wiki.repo.commits('master').size end @@ -95,7 +95,7 @@ context "Frontend" do assert_nil @wiki.page("B") page_2 = @wiki.page('C') assert_equal 'abc', page_2.raw_data - assert_equal 'def [ed6c9f6]', page_2.version.message + assert_equal 'def', page_2.version.message assert_not_equal page_1.version.sha, page_2.version.sha end diff --git a/test/test_unicode.rb b/test/test_unicode.rb index f52bc7d8..0ffed378 100644 --- a/test/test_unicode.rb +++ b/test/test_unicode.rb @@ -61,8 +61,8 @@ context "Frontend Unicode support" do assert last_response.ok? @wiki.update_page(@wiki.page('PG'), nil, nil, '다른 text', {}) - page2 = @wiki.page('PG') - assert_equal '다른 text', utf8(page2.raw_data) + page = @wiki.page('PG') + assert_equal '다른 text', utf8(page.raw_data) post '/edit/PG', :page => 'PG', :content => '바뀐 text', :message => 'ghi' follow_redirect! @@ -71,7 +71,7 @@ context "Frontend Unicode support" do @wiki = Gollum::Wiki.new(@path) page = @wiki.page('PG') assert_equal '바뀐 text', utf8(page.raw_data) - assert_equal 'ghi [' + page2.version_short + ']', page.version.message + assert_equal 'ghi', page.version.message end test "heavy use 2" do @@ -82,8 +82,8 @@ context "Frontend Unicode support" do @wiki.update_page(@wiki.page('k'), nil, nil, '다른 text', {}) @wiki = Gollum::Wiki.new(@path) - page2 = @wiki.page('k') - assert_equal '다른 text', utf8(page2.raw_data) + page = @wiki.page('k') + assert_equal '다른 text', utf8(page.raw_data) post '/edit/' + CGI.escape('한글'), :page => 'k', :content => '바뀐 text', :format => 'markdown', :message => 'ghi' @@ -93,7 +93,7 @@ context "Frontend Unicode support" do @wiki = Gollum::Wiki.new(@path) page = @wiki.page('k') assert_equal '바뀐 text', utf8(page.raw_data) - assert_equal 'ghi [' + page2.version_short + ']', page.version.message + assert_equal 'ghi', page.version.message end test 'transliteration' do