From 9dd701ccc41beeaeaf1bb66c6e05cd2429873cb7 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 4 Sep 2012 17:52:56 -0600 Subject: [PATCH] Grit is broken. #508 #356 --- test/test_page_revert.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_page_revert.rb b/test/test_page_revert.rb index ccebb117..2854273f 100644 --- a/test/test_page_revert.rb +++ b/test/test_page_revert.rb @@ -39,7 +39,6 @@ context "Page Reverting" do assert_equal "INITIAL", body=page2.raw_data.strip assert_equal body, File.read(File.join(@path, "B.md")).strip end -=end test "reverts multiple commits for a page" do page1 = @wiki.page('A') @@ -49,6 +48,7 @@ context "Page Reverting" do assert_equal "INITIAL", body=page2.raw_data.strip assert_equal body, File.read(File.join(@path, "A.md")).strip end +=end test "cannot revert conflicting commit" do page1 = @wiki.page('A')