diff --git a/test/examples/revert.git/COMMIT_EDITMSG b/test/examples/revert.git/COMMIT_EDITMSG new file mode 100644 index 00000000..0b35d094 --- /dev/null +++ b/test/examples/revert.git/COMMIT_EDITMSG @@ -0,0 +1 @@ +add footer and sidebar diff --git a/test/examples/revert.git/index b/test/examples/revert.git/index index 07167762..850cc019 100644 Binary files a/test/examples/revert.git/index and b/test/examples/revert.git/index differ diff --git a/test/examples/revert.git/info/refs b/test/examples/revert.git/info/refs deleted file mode 100644 index dfa907b6..00000000 --- a/test/examples/revert.git/info/refs +++ /dev/null @@ -1,3 +0,0 @@ -7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/heads/master -7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/remotes/origin/HEAD -7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/remotes/origin/master diff --git a/test/examples/revert.git/logs/HEAD b/test/examples/revert.git/logs/HEAD index 3a5bcd9e..ebf192d4 100644 --- a/test/examples/revert.git/logs/HEAD +++ b/test/examples/revert.git/logs/HEAD @@ -1 +1,2 @@ -0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick 1291848403 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git +0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick 1291942707 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git +7c45b5f16ff3bae2a0063191ef832701214d4df5 f403b791119f8232b7cb0ba455c624ac6435f433 rick 1291942743 -0800 commit: add footer and sidebar diff --git a/test/examples/revert.git/logs/refs/heads/master b/test/examples/revert.git/logs/refs/heads/master index 3a5bcd9e..ebf192d4 100644 --- a/test/examples/revert.git/logs/refs/heads/master +++ b/test/examples/revert.git/logs/refs/heads/master @@ -1 +1,2 @@ -0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick 1291848403 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git +0000000000000000000000000000000000000000 7c45b5f16ff3bae2a0063191ef832701214d4df5 rick 1291942707 -0800 clone: from /Users/rick/p/gollum/test/examples/revert.git +7c45b5f16ff3bae2a0063191ef832701214d4df5 f403b791119f8232b7cb0ba455c624ac6435f433 rick 1291942743 -0800 commit: add footer and sidebar diff --git a/test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9 b/test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9 new file mode 100644 index 00000000..e1568d27 Binary files /dev/null and b/test/examples/revert.git/objects/41/76394bfa11222363c66ce7e84b5f154095b6d9 differ diff --git a/test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708 b/test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708 new file mode 100644 index 00000000..77148f56 Binary files /dev/null and b/test/examples/revert.git/objects/6a/69f92020f5df77af6e8813ff1232493383b708 differ diff --git a/test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc b/test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc new file mode 100644 index 00000000..7e24035b Binary files /dev/null and b/test/examples/revert.git/objects/b4/785957bc986dc39c629de9fac9df46972c00fc differ diff --git a/test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433 b/test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433 new file mode 100644 index 00000000..cd389b2a Binary files /dev/null and b/test/examples/revert.git/objects/f4/03b791119f8232b7cb0ba455c624ac6435f433 differ diff --git a/test/examples/revert.git/packed-refs b/test/examples/revert.git/packed-refs index 76aa95e8..63895b96 100644 --- a/test/examples/revert.git/packed-refs +++ b/test/examples/revert.git/packed-refs @@ -1,3 +1,2 @@ # pack-refs with: peeled -7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/heads/master 7c45b5f16ff3bae2a0063191ef832701214d4df5 refs/remotes/origin/master diff --git a/test/examples/revert.git/refs/heads/master b/test/examples/revert.git/refs/heads/master new file mode 100644 index 00000000..29d97287 --- /dev/null +++ b/test/examples/revert.git/refs/heads/master @@ -0,0 +1 @@ +f403b791119f8232b7cb0ba455c624ac6435f433 diff --git a/test/test_app.rb b/test/test_app.rb index 9026a473..8c5610ab 100644 --- a/test/test_app.rb +++ b/test/test_app.rb @@ -5,7 +5,7 @@ context "Frontend" do include Rack::Test::Methods setup do - @path = cloned_testpath("examples/lotr.git") + @path = cloned_testpath("examples/revert.git") @wiki = Gollum::Wiki.new(@path) Precious::App.set(:gollum_path, @path) end @@ -15,8 +15,8 @@ context "Frontend" do end test "edits page" do - page_1 = @wiki.page('Bilbo Baggins') - post "/edit/#{Gollum::Page.cname page_1.name}", :content => 'abc', + page_1 = @wiki.page('A') + post "/edit/A", :content => 'abc', :format => page_1.format, :message => 'def' follow_redirect! assert last_response.ok? @@ -29,11 +29,11 @@ context "Frontend" do end test "edits page footer and sidebar" do - page_1 = @wiki.page('Bilbo Baggins') + page_1 = @wiki.page('A') foot_1 = page_1.footer side_1 = page_1.sidebar - post "/edit/#{Gollum::Page.cname page_1.name}", + post "/edit/A", :footer => 'footer', :sidebar => 'sidebar', :format => page_1.format, :message => 'def' follow_redirect! @@ -55,34 +55,34 @@ context "Frontend" do end test "renames page" do - page_1 = @wiki.page('Bilbo Baggins') - post "/edit/#{Gollum::Page.cname page_1.name}", :content => 'abc', - :rename => "Bilbo Whatever", + page_1 = @wiki.page('B') + post "/edit/B", :content => 'abc', + :rename => "C", :format => page_1.format, :message => 'def' follow_redirect! assert last_response.ok? @wiki.clear_cache - assert_nil @wiki.page(page_1.name) - page_2 = @wiki.page('Bilbo Whatever') + assert_nil @wiki.page("B") + page_2 = @wiki.page('C') assert_equal 'abc', page_2.raw_data assert_equal 'def', page_2.version.message assert_not_equal page_1.version.sha, page_2.version.sha end test "creates page" do - post "/create", :content => 'abc', :page => "Newbie", + post "/create", :content => 'abc', :page => "D", :format => 'markdown', :message => 'def' follow_redirect! assert last_response.ok? - page = @wiki.page('Newbie') + page = @wiki.page('D') assert_equal 'abc', page.raw_data assert_equal 'def', page.version.message end test "guards against creation of existing page" do - name = "Bilbo Baggins" + name = "A" post "/create", :content => 'abc', :page => name, :format => 'markdown', :message => 'def' assert last_response.ok?