Wiki2Go 1.17.5 → 1.22.0

data/test/TestRepository.rb

@@ -0,0 +1,50 @@
+
+#!/usr/bin/ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
+
+
+require 'test/unit'
+
+require "Wiki2Go/Install/make_site"
+require "Wiki2Go/Install/make_repository"
+require 'fileutils'
+require 'UnitTestFiles'
+
+include FileUtils
+
+class TestRepository <  Test::Unit::TestCase
+
+  def test_make_repository
+    scratch = scratch_dir('testcvs')
+    repository_dir = File.join(scratch,'repository')
+    wiki_dir       = File.join(scratch,'readwrite')
+    user = ENV['USER'] || ENV['USERNAME']
+    args = ['-d', repository_dir , '-u' ,user, '-g' , user, '-m' , 'readwrite']
+    Wiki2Go::RepositoryMaker.create(args)
+    assert File.exists?(repository_dir)
+
+    args = ['-s', 'http://wiki2go.nayima.be/blog' , '-w' , 'Wiki2Go' , '-t' , 'readwrite', '-d' , wiki_dir]
+    Wiki2Go::Install.make_site(args)
+
+    args = ['-d', repository_dir , '-w' ,wiki_dir, '-m' , 'readwrite']
+    added = Wiki2Go::RepositoryMaker.addwiki(args)
+    added = Wiki2Go::RepositoryMaker.addwiki(args)
+    assert_equal 0,added.length
+    args = ['-d', repository_dir , '-w' ,wiki_dir]
+    Wiki2Go::RepositoryMaker.updatewiki(args)
+  end
+
+
+  private
+
+  def scratch_dir(type)
+    dest = UnitTestFiles.scratchdata('wiki',type)
+    if File.exists?(dest) then
+      rm_rf(dest)
+    end
+    mkdir_p dest
+    dest
+  end
+
+end
+

data/test/TestServer.rb

@@ -20,7 +20,7 @@ class TestServer <  Test::Unit::TestCase
     assert(!server.nil?)
     thread = server.start { |config|
       assert_equal('81',config.port)
-      assert_equal('.',config.root_directory) 
+      assert_equal(Dir.getwd,config.root_directory) 
       assert_equal(true,config.multi_wiki)
     }
     sleep(5) # Let the webserver start
@@ -41,10 +41,10 @@ class TestServer <  Test::Unit::TestCase
     assert(!server.nil?)
     thread = server.start { |config|
       assert_equal('81',config.port)
-      assert_equal('.',config.root_directory) 
+      assert_equal(Dir.getwd,config.root_directory) 
       assert_equal(false,config.multi_wiki)
     }
-    sleep(5) # Let the webserver start
+    sleep(15) # Let the webserver start
 
     Net::HTTP.start('localhost', 81) { |http|
       response = http.get('/view/FrontPage')
@@ -58,8 +58,3 @@ class TestServer <  Test::Unit::TestCase
   
 end
 
-
-if $0 == __FILE__
-  RUNIT::CUI::TestRunner.run(TestServer.suite)
-end
-

data/test/TestSpamFilter.rb

@@ -24,7 +24,7 @@ class SpamMockStorage
     end
   end
 
-  def load_blacklist(type)
+  def load_blacklist(type,normalize_urls=false)
     @blacklists[type] = Wiki2Go::BlackList.new(type,[]) if !@blacklists.has_key?(type)
     @blacklists[type]
   end
@@ -125,6 +125,38 @@ class TestSpamFilter <  Test::Unit::TestCase
     
   end
 
+  def test_spamfilter_recognizes_attempts_to_hide_stuff
+    content = <<HIDDEN_SPAM
+[BernardVanderBeken] NakedObjects ( http://www.nakedobjects.org ) are an interesting way of implementing a system.  A pair could explore this Java/.NET framework in order to learn about the benefits.
+336275370206207295404361
+<u style="display:none;"> Beneficiaries the on tri-pak
+zithromax copy [ ]  patients. National hct
+loprox
+lorabid
+lorazepam
+lorazepam [ ] considers united  within good generic are xr
+ciprodex
+ciprofloxacin program's the.</u>
+HIDDEN_SPAM
+
+    assert @spam_filter.hidden_text_in(content)
+    assert @spam_filter.hidden_text_in('<u style = "color:white; display:none;"> Beneficiaries the on tri-pak')
+    assert !@spam_filter.hidden_text_in("style = \"display:none\"")
+  end
 
+  def test_spamfilter_recognizes_empty_urls
+    content = <<EMPTY_URLS
+<a href="  "> </a>
+EMPTY_URLS
+    
+    assert @spam_filter.empty_urls_in(content)
+  end
+  
+  def test_spamfilter_detects_clearing_a_page
+    assert @spam_filter.cleared_page?('')
+    assert @spam_filter.cleared_page?("     \r\n   \t \r  \n")
+
+    assert !@spam_filter.cleared_page?("     \r\n  a word \t \r  \n")
+  end
 
 end

data/test/TestStorage.rb

@@ -130,6 +130,17 @@ class TestStorage <  Test::Unit::TestCase
     assert_equal(page1.name,matches[0].name)
   end
 
+  
+  def test_search_accepts_all_input
+    page1 = Wiki2Go::Page.new("FrontPage",[ "The Wiki2Go homepage", 'by the Wiki2Go team'], "pvc",Time.now,"FrontPage")
+    @storage.save_page("Wiki2Go",page1)
+    page2 = Wiki2Go::Page.new("OtherPage",[ 'Some other stuff', 'about Wiki2Go'], "pvc",Time.now,"OtherPage")
+    @storage.save_page("Wiki2Go",page1)
+
+    matches = @storage.search("Wiki2Go",'/Hi[url=http:\/\/uk.geocities.com\/autorentalcar\/car-rental-companies.html]car rental companies[\/url]')
+    assert_equal(0,matches.length)
+  end
+  
   def test_save_spam
     content = ['line1', 'Line with spam']
     @storage.save_spam('Xpday','SpamPage',content,'Me')

data/test/TestWeb.rb

@@ -132,11 +132,11 @@ class TestWeb <  Test::Unit::TestCase
   def test_login
     env = {"HTTP_HOST"=>"wiki.xp.be", "HTTP_REFERER"=>"http://wiki.xp.be/scripts/view/Xpbe/PairProgrammingParty2004September14", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0", "PATH"=>"/sbin:/bin:/usr/sbin:/usr/bin:/usr/bin/X11:/usr/local/sbin:/usr/local/bin", "REMOTE_ADDR"=>"80.200.195.232", "REMOTE_PORT"=>"62539", "SCRIPT_FILENAME"=>"/home/pvc/sites/xpbe/wiki2/site//view", "SERVER_ADDR"=>"212.13.211.135", "SERVER_ADMIN"=>"webmaster@nayima.vm.bytemark.co.uk", "SERVER_NAME"=>"wiki.xp.be", "SERVER_PORT"=>"80", "SERVER_SIGNATURE"=>"<ADDRESS>Apache/1.3.26 Server at wiki.xp.be Port 80</ADDRESS>\n", "SERVER_SOFTWARE"=>"Apache/1.3.26 (Unix) Debian GNU/Linux PHP/4.1.2", "GATEWAY_INTERFACE"=>"CGI/1.1", "SERVER_PROTOCOL"=>"HTTP/1.1", "REQUEST_METHOD"=>"GET", "QUERY_STRING"=>"", "REQUEST_URI"=>"/scripts/view/Xpbe/PairProgrammingParties", "SCRIPT_NAME"=>"/scripts/view", "PATH_INFO"=>"/Xpbe/PairProgrammingParties"}
     web = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://wiki.xp.be/scripts/view/Xpbe/PairProgrammingParties',env),@config)
-    assert(!web.secure)  
+    assert(!web.secure?)  
     env["AUTH_TYPE"] = "Basic"
     env["REMOTE_USER"] = "Pascal"
     web = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://wiki.xp.be/scripts/view/Xpbe/PairProgrammingParties',env),@config)
-    assert(web.secure)  
+    assert(web.secure?)  
     assert_equal("Pascal",web.user)
   end
   

data/test/TestWiki2Go.rb

@@ -4,8 +4,9 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 
 require 'test/unit'
 
-require "Wiki2Go/WikiFormatter"
 require "Wiki2Go/Wiki2Go"
+
+require "Wiki2Go/WikiFormatter"
 require "Wiki2Go/Web"
 require "Wiki2Go/FileStorage"
 require "Wiki2GoConfigForTest"
@@ -16,169 +17,768 @@ require "UnitTestFiles"
 
 class TestWiki2Go <  Test::Unit::TestCase
 
-  include UnitTestFiles
-
-  def setup
-    UnitTestFiles.clean
-    FileUtils.mkdir_p UnitTestFiles.scratchdata
-    @config = TestDataWiki2GoConfig.new
-  end
-
-  def teardown
-    @config.close unless @config.nil?
-  end
-
-  def test_view
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
-
-    html = wiki.view(wikiweb)
-
-    assert_same_file_string(testdata('expected_view.html'),scratchdata('generated_view.html'),html)
-
-  end  
-
-  def test_versions
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/versions/Xpday/FrontPage","versions",@config)
-
-    html = wiki.versions(wikiweb)
-
-    #    assert_same_file_string(testdata('expected_versions.html'),scratchdata('generated_versions.html'),html)
-
-  end
-
-  def test_edit
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
-
-    html = wiki.edit(wikiweb)
-
-    assert_same_file_string(testdata('expected_edit.html'),scratchdata('generated_edit.html'),html)
-
-  end
-
-  def test_save
-    @config.close
-    @config = TestWiki2GoConfig.new
-    assert(!@config.generate_html)
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
-    wiki.save(wikiweb,"FrontPage")
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/test","view",@config)
-    wikiweb.title = "FrontPagename"
-    redirect_url = wiki.save(wikiweb,"FrontPage")
-    assert_equal("http://localhost/view/Xpday/test",redirect_url)
-
-    html = wiki.view(wikiweb)
-
-    assert_same_file_string(testdata('expected_save.html'),scratchdata('generated_save.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") } )
-
-  end
-
-
-
-  def test_save_with_html
-    @config.close
-    @config = TestWiki2GoConfig.new
-    @config.generate_html = true
-
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
-    wiki.save(wikiweb,"FrontPage")
-
-    wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/test","view",@config)
-
-    root = @config.site_directory
-    path = File.join(root,wikiweb.name, wikiweb.current_page + ".html")
-    File.delete(path) if File.exists?(path)
-
-    wikiweb.title = "Frontpagename"
-    redirect_url = wiki.save(wikiweb,"FrontPage")
-    assert_equal("http://localhost/Xpday/test.html",redirect_url)
-
-    assert(File.exists?(path))
-    assert_same_file(testdata('expected_savehtml.html'),path, { "DATE" => Time.new.strftime("%d/%m/%Y") } )
-
-  end
-
-  def test_generate_static
-    @config.close
-    @config = PrivateTestWiki2GoConfig.new
-
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    request = Web2Go::MockRequest.new('http://localhost:8088/generate_static/NonExistingWeb/FrontPage')
-    request.authenticated = true
-    request.user = 'admin'
-    wikiweb = Wiki2Go::Web.from_request(request,@config)
-    wiki.save(wikiweb,"FrontPage")
-    #    puts wiki.generate_html(wikiweb)
-  end
-
-
-
-  def test_changes
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.page_url("localhost","80","/upload/Xpday","changes",@config)
-
-    html = wiki.changes(wikiweb)
-
-    #    assert_same_file_string(testdata('expected_changes.html'),scratchdata('generated_changes.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
-
-  end
-
-  def test_search
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.page_url("localhost","80","/search/Xpday","search",@config)
-
-    html = wiki.search(wikiweb,"Benelux")
-
-    assert_same_file_string(testdata('expected_search.html'),scratchdata('generated_search.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
-
-  end
-
-  def test_upload_files
-    @config.close
-    @config = TestWiki2GoConfig.new
-    wiki = Wiki2Go::Wiki.new(@config)
-
-    wikiweb = Wiki2Go::Web.page_url("localhost","80","/upload/Xpday/UploadPage","upload",@config)
-    wikiweb.title = 'simple'
-    wiki.save(wikiweb,'A simple page\n')
-
-    redirect = wiki.upload(wikiweb,"brol.txt","hello peops")
-    assert_equal 'http://localhost/view/Xpday/UploadPage',redirect
-
-    html = wiki.view(wikiweb)
-    assert_same_file_string(testdata('expected_upload.html'),scratchdata('generated_upload.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
-
-    redirect = wiki.upload(wikiweb,'',nil)
-    assert_equal 'http://localhost/view/Xpday/UploadPage',redirect
-
-    html = wiki.view(wikiweb)
-    assert_same_file_string(testdata('expected_upload.html'),scratchdata('generated_upload.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
-
-  end
-
-  def test_default_admin_page
-    wiki = Wiki2Go::Wiki.new(TestWiki2GoConfig.new)
-    request = Web2Go::MockRequest.new('http://localhost/admin')
-
-    result = wiki.admin(request)
-
-    request = Web2Go::MockRequest.new('http://localhost/admin/regenerate')
-
-    result = wiki.admin(request)
-
-  end
-
+    include UnitTestFiles
+    
+    def setup
+        UnitTestFiles.clean
+        FileUtils.mkdir_p UnitTestFiles.scratchdata
+        @config = TestDataWiki2GoConfig.new
+    end
+    
+    def teardown
+        @config.close unless @config.nil?
+    end
+    
+    def test_view
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
+        
+        html = wiki.view(wikiweb,-1)
+        
+        assert_same_file_string(testdata('expected_view.html'),scratchdata('generated_view.html'),html)
+        
+    end  
+    
+    def test_versions
+        @config.close
+        @config = ScratchWikiConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"edited by good girl")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'evilguy'} ),@config)
+        wiki.save(wikiweb,"edited by nasty man who spams")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodguy'} ),@config)
+        wiki.save(wikiweb,"edited by good boy")
+
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/versions/Xpday/FrontPage","versions",@config)
+        
+        blacklist = @config.banned_users
+        blacklist.add('evilguy')
+        
+        html = wiki.versions(wikiweb)
+        # puts html
+        
+        assert_same_file_string(testdata('expected_versions.html'),scratchdata('generated_versions.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage?version=0' ),@config)
+        
+        html = wiki.view(wikiweb,0)
+
+        assert_match(/edited by good girl/,html,'version 0 should be the first edit')
+        
+#        puts html
+
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage?version=1' ),@config)
+        
+        html = wiki.view(wikiweb,1)
+        assert_match(/edited by good boy/,html,'version 1 should be the edit after the spammer')
+
+#        puts html
+
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage?version=2' ),@config)
+        
+        html = wiki.view(wikiweb,2)
+        assert_match(/edited by good boy/,html,'version 1 should be the edit after the spammer')
+
+#        puts html
+    end
+
+    def test_diff
+        @config.close
+        @config = ScratchWikiConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"start<br>edited by *good girl & boy*\nI want a pony!")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodboy'} ),@config)
+        wiki.save(wikiweb,"start<br />edited by *good girl & boy*\nI hate ponies!")
+        
+        html = wiki.diff(wikiweb,0,1)
+        # puts html
+        assert_same_markup_strings(expected_diff,html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+
+    def test_diff_with_multiple_versions
+        @config.close
+        @config = ScratchWikiConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"Edited by good girl\nVersion 0")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodboy'} ),@config)
+        wikiweb.title = "Front Page"
+        wiki.save(wikiweb,"Edited by good boy\nVersion 1")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"Edited by good girl\nVersion 2")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodboy'} ),@config)
+        wiki.save(wikiweb,"Edited by good boy\nVersion 3")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"Edited by good girl\nVersion 4")
+        
+        html = wiki.diff(wikiweb,1,2)
+        #       puts html
+        assert_same_markup_strings(expected_diff_with_multiple_versions,html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+        html = wiki.diff(wikiweb,1,3)
+        assert_same_markup_strings(expected_diff_with_multiple_separated_versions,html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+    
+    def test_sidebyside
+        @config.close
+        @config = ScratchWikiConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodgirl'} ),@config)
+        wiki.save(wikiweb,"start<br>edited by *good girl & boy*\nI want a pony!")
+        
+        wikiweb = Wiki2Go::Web.from_request(Web2Go::MockRequest.new('http://localhost/view/Xpday/FrontPage',{ 'REMOTE_USER' => 'goodboy'} ),@config)
+        wiki.save(wikiweb,"start<br />edited by *good girl & boy*\nI hate ponies!")
+        
+        html = wiki.sidebyside(wikiweb,0,1)
+        # puts html
+        assert_same_markup_strings(expected_sidebyside,html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+        
+    def test_edit
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/edit/Xpday/FrontPage","edit",@config)
+        
+        html = wiki.edit(wikiweb)
+        
+        assert_same_file_string(testdata('expected_edit.html'),scratchdata('generated_edit.html'),html)
+        
+    end
+    
+    def test_save
+        @config.close
+        @config = TestWiki2GoConfig.new
+        assert(!@config.generate_html)
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
+        wiki.save(wikiweb,"FrontPage")
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/test","view",@config)
+        wikiweb.title = "FrontPagename"
+        redirect_url = wiki.save(wikiweb,"FrontPage")
+        assert_equal("http://localhost/view/Xpday/test",redirect_url)
+        
+        html = wiki.view(wikiweb,-1)
+        
+        assert_same_file_string(testdata('expected_save.html'),scratchdata('generated_save.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") } )
+        
+    end
+    
+    
+    
+    def test_save_with_html
+        @config.close
+        @config = TestWiki2GoConfig.new
+        @config.generate_html = true
+        
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/FrontPage","view",@config)
+        wiki.save(wikiweb,"FrontPage")
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/view/Xpday/test","view",@config)
+        
+        root = @config.site_directory
+        path = File.join(root,wikiweb.name, wikiweb.current_page + ".html")
+        File.delete(path) if File.exists?(path)
+        
+        wikiweb.title = "Frontpagename"
+        redirect_url = wiki.save(wikiweb,"FrontPage")
+        assert_equal("http://localhost/Xpday/test.html",redirect_url)
+        
+        assert(File.exists?(path))
+        assert_same_file(testdata('expected_savehtml.html'),path, { "DATE" => Time.new.strftime("%d/%m/%Y") } )
+        
+    end
+    
+    def test_generate_static
+        @config.close
+        @config = PrivateTestWiki2GoConfig.new
+        
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        request = Web2Go::MockRequest.new('http://localhost:8088/generate_static/NonExistingWeb/FrontPage')
+        request.authenticated = true
+        request.user = 'admin'
+        wikiweb = Wiki2Go::Web.from_request(request,@config)
+        wiki.save(wikiweb,"FrontPage")
+        #    puts wiki.generate_html(wikiweb)
+    end
+    
+    def test_format_for_fckeditor
+        @config.close
+        @config = TestWiki2GoConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/save/Xpday/SimplePage","save",@config)
+        wikiweb.title = 'simple'
+        wiki.save(wikiweb,'A simple page\n')
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/save/Xpday/OtherPage","save",@config)
+        wikiweb.title = 'other'
+        wiki.save(wikiweb,'A simple page\n')
+        
+        
+        wikiweb = Wiki2Go::Web.from_page_url("http://localhost/admin/Xpday/","admin",@config)
+        
+        html = wiki.prepare_for_fckeditor(wikiweb)
+        
+        dir = @config.root_directory
+        assert File.exists?(File.join(dir,'texts','Xpday','OtherPage.txt'))
+        assert File.exists?(File.join(dir,'texts','Xpday','OtherPage.bak'))
+        assert File.exists?(File.join(dir,'texts','Xpday','SimplePage.txt'))
+        assert File.exists?(File.join(dir,'texts','Xpday','SimplePage.bak'))
+    end
+    
+    def test_changes
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/upload/Xpday","changes",@config)
+        
+        html = wiki.changes(wikiweb)
+        
+        #    assert_same_file_string(testdata('expected_changes.html'),scratchdata('generated_changes.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+    
+    def test_search
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/search/Xpday","search",@config)
+        
+        html = wiki.search(wikiweb,"Benelux")
+        
+        assert_same_file_string(testdata('expected_search.html'),scratchdata('generated_search.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+    
+    def test_upload_files
+        @config.close
+        @config = TestWiki2GoConfig.new
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/upload/Xpday/UploadPage","upload",@config)
+        wikiweb.title = 'simple'
+        wiki.save(wikiweb,'A simple page\n')
+        
+        redirect = wiki.upload(wikiweb,"brol.txt","hello peops")
+        assert_equal 'http://localhost/view/Xpday/UploadPage',redirect
+        
+        html = wiki.view(wikiweb,-1)
+        assert_same_file_string(testdata('expected_upload.html'),scratchdata('generated_upload.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+        redirect = wiki.upload(wikiweb,'',nil)
+        assert_equal 'http://localhost/view/Xpday/UploadPage',redirect
+        
+        html = wiki.view(wikiweb,-1)
+        assert_same_file_string(testdata('expected_upload.html'),scratchdata('generated_upload.html'),html, { "DATE" => Time.new.strftime("%d/%m/%Y") })
+        
+    end
+    
+    def test_default_admin_page
+        wiki = Wiki2Go::Wiki.new(TestWiki2GoConfig.new)
+        request = Web2Go::MockRequest.new('http://localhost/admin')
+        
+        result = wiki.admin(request)
+        
+        request = Web2Go::MockRequest.new('http://localhost/admin/regenerate')
+        
+        result = wiki.admin(request)
+        
+    end
+    
+    def test_hanging_frontpage
+        wiki = Wiki2Go::Wiki.new(@config)
+        
+        wikiweb = Wiki2Go::Web.page_url("localhost","80","/view/Bugs/FrontPage","view",@config)
+#        puts wiki.view(wikiweb,-1)
+    end
+        
+    private
+    
+    def expected_diff_with_multiple_versions
+        return <<END_EXPECTED_DIFF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
+        <TITLE>
+            
+            Xpday
+            -
+            
+            FrontPage
+        </TITLE>
+    </HEAD>
+    <BODY>
+        <table id="container">
+            <tr>
+                <td colspan="2" id="header">
+                    <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
+                        <TR>
+                            <TD><h1><a href="/search/Xpday?text=FrontPage" rel="nofollow">FrontPage</a>
+                                    
+                                    <a href="/view/Xpday/FrontPage">v.2</a>
+                                    
+                                </h1>
+                            </TD>
+                            <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
+                        </TR>
+                    </TABLE>
+                </td>
+            </tr>
+            <tr>
+                <td id="menu" valign="top" nowrap>
+                    
+<ul>
+    <li>
+        <a href="/versions/Xpday/FrontPage" rel="nofollow">Page&nbsp;History</a>
+    </li>
+
+    <li>
+        <a href="/sidebyside/Xpday/FrontPage?from=1&amp;to=2" rel="nofollow">What&nbsp;changed?</a>
+    </li>
+
+    <li>
+        <a href="/diff/Xpday/FrontPage?from=1&amp;to=2" rel="nofollow">Diff</a>
+    </li>
+    <li>
+        <a href="/wikiedit/Xpday/FrontPage" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
+    </li>
+</ul>
+<hr>
+
+<ul>
+    <li>
+        <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
+    </li>
+    <li>
+        <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
+    </li>
+</ul>
+                </td>
+                <td id="body" width="100%" valign="top">
+                    <strong>FrontPage <a href="/diff/Xpday/FrontPage?from=0&amp;to=2" rel="nofollow">&lt;&lt;</a> <a href="/view/Xpday/FrontPage?version=1">v1 (by goodboy)</a> => <a href="/view/Xpday/FrontPage?version=2">v2 (by goodgirl)</a> <a href="/diff/Xpday/FrontPage?from=1&amp;to=3" rel="nofollow">&gt;&gt;</a></strong>
+<hr>
+
+<div class=\"diff_deleted\">&lt;&nbsp;Edited&nbsp;by&nbsp;good&nbsp;boy</div>
+<div class=\"diff_added\">&gt;&nbsp;Edited&nbsp;by&nbsp;good&nbsp;girl</div>
+<div class=\"diff_deleted\">&lt;&nbsp;Version&nbsp;1</div>
+<div class=\"diff_added\">&gt;&nbsp;Version&nbsp;2</div>
+                </td>
+            </tr>
+            <tr>
+            <td colspan="2" id="footer">
+                <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+    <TR>
+        <TD width="50%">
+            
+            <a href="/sidebyside/Xpday/FrontPage?from=1&amp;to=2" rel="nofollow">Changed</a>
+            on
+            DATE
+            by
+            <a href="/search/Xpday?text=goodgirl" rel="nofollow">goodgirl</a>
+            
+        </TD>
+        <TD width="50%" align="right">
+            Contact the site administrator:
+            <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
+        </TD>
+    </TR>
+    <tr><td colspan="2"><hr></td></tr>
+    <tr>
+        <td><FORM action="/search/Xpday" method="post" id="search" name="search">
+                Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
+            </FORM>
+        </td>
+        <td>
+            
+        </td>
+    </tr>
+</TABLE>
+            </td>
+            </tr>
+        </table>
+        <span style="float:right">
+            <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/FrontPage">
+                <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
+        </span>
+    </BODY>
+</HTML>
+END_EXPECTED_DIFF
+    end
+
+        def expected_diff_with_multiple_separated_versions
+        return <<END_EXPECTED_DIFF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
+        <TITLE>
+            
+            Xpday
+            -
+            
+            FrontPage
+        </TITLE>
+    </HEAD>
+    <BODY>
+        <table id="container">
+            <tr>
+                <td colspan="2" id="header">
+                    <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
+                        <TR>
+                            <TD><h1><a href="/search/Xpday?text=FrontPage" rel="nofollow">FrontPage</a>
+                                    
+                                    <a href="/view/Xpday/FrontPage">v.3</a>
+                                    
+                                </h1>
+                            </TD>
+                            <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
+                        </TR>
+                    </TABLE>
+                </td>
+            </tr>
+            <tr>
+                <td id="menu" valign="top" nowrap>
+                    
+<ul>
+    <li>
+        <a href="/versions/Xpday/FrontPage" rel="nofollow">Page&nbsp;History</a>
+    </li>
+
+    <li>
+        <a href="/sidebyside/Xpday/FrontPage?from=1&amp;to=3" rel="nofollow">What&nbsp;changed?</a>
+    </li>
+
+    <li>
+        <a href="/diff/Xpday/FrontPage?from=1&amp;to=3" rel="nofollow">Diff</a>
+    </li>
+    <li>
+        <a href="/wikiedit/Xpday/FrontPage" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
+    </li>
+</ul>
+<hr>
+
+<ul>
+    <li>
+        <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
+    </li>
+    <li>
+        <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
+    </li>
+</ul>
+                </td>
+                <td id="body" width="100%" valign="top">
+                    <strong>FrontPage <a href="/diff/Xpday/FrontPage?from=0&amp;to=3" rel="nofollow">&lt;&lt;</a> <a href="/view/Xpday/FrontPage?version=1">v1 (by goodboy)</a> <a href="/diff/Xpday/FrontPage?from=2&amp;to=3" rel="nofollow">&gt;&gt;</a> => <a href="/diff/Xpday/FrontPage?from=1&amp;to=2" rel="nofollow">&lt;&lt;</a> <a href="/view/Xpday/FrontPage?version=3">v3 (by goodboy)</a> <a href="/diff/Xpday/FrontPage?from=1&amp;to=4" rel="nofollow">&gt;&gt;</a></strong>
+<hr>
+
+<div class=\"diff_kept\">=&nbsp;Edited&nbsp;by&nbsp;good&nbsp;boy</div>
+<div class=\"diff_deleted\">&lt;&nbsp;Version&nbsp;1</div>
+<div class=\"diff_added\">&gt;&nbsp;Version&nbsp;3</div>
+                </td>
+            </tr>
+            <tr>
+            <td colspan="2" id="footer">
+                <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+    <TR>
+        <TD width="50%">
+            
+            <a href="/sidebyside/Xpday/FrontPage?from=1&amp;to=3" rel="nofollow">Changed</a>
+            on
+            DATE
+            by
+            <a href="/search/Xpday?text=goodboy" rel="nofollow">goodboy</a>
+            
+        </TD>
+        <TD width="50%" align="right">
+            Contact the site administrator:
+            <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
+        </TD>
+    </TR>
+    <tr><td colspan="2"><hr></td></tr>
+    <tr>
+        <td><FORM action="/search/Xpday" method="post" id="search" name="search">
+                Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
+            </FORM>
+        </td>
+        <td>
+            
+        </td>
+    </tr>
+</TABLE>
+            </td>
+            </tr>
+        </table>
+        <span style="float:right">
+            <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/FrontPage">
+                <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
+        </span>
+    </BODY>
+</HTML>
+END_EXPECTED_DIFF
+    end
+
+        def expected_diff
+        return <<END_EXPECTED_DIFF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
+        <TITLE>
+            
+            Xpday
+            -
+            
+            FrontPage
+        </TITLE>
+    </HEAD>
+    <BODY>
+        <table id="container">
+            <tr>
+                <td colspan="2" id="header">
+                    <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
+                        <TR>
+                            <TD><h1><a href="/search/Xpday?text=FrontPage" rel="nofollow">FrontPage</a>
+                                    
+                                    <a href="/view/Xpday/FrontPage">v.1</a>
+                                    
+                                </h1>
+                            </TD>
+                            <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
+                        </TR>
+                    </TABLE>
+                </td>
+            </tr>
+            <tr>
+                <td id="menu" valign="top" nowrap>
+                    
+<ul>
+    <li>
+        <a href="/versions/Xpday/FrontPage" rel="nofollow">Page&nbsp;History</a>
+    </li>
+
+    <li>
+        <a href="/sidebyside/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">What&nbsp;changed?</a>
+    </li>
+
+    <li>
+        <a href="/diff/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">Diff</a>
+    </li>
+    <li>
+        <a href="/wikiedit/Xpday/FrontPage" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
+    </li>
+
+</ul>
+<hr>
+
+<ul>
+    <li>
+        <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
+    </li>
+    <li>
+        <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
+    </li>
+</ul>
+                </td>
+                <td id="body" width="100%" valign="top">
+                    <strong>FrontPage <a href="/view/Xpday/FrontPage?version=0">v0 (by goodgirl)</a> => <a href="/view/Xpday/FrontPage?version=1">v1 (by goodboy)</a> <a href="/diff/Xpday/FrontPage?from=0&amp;to=2" rel="nofollow">&gt;&gt;</a></strong>
+<hr>
+
+<div class="diff_kept">=&nbsp;start</div>
+<div class="diff_kept">=&nbsp;edited&nbsp;by&nbsp;*good&nbsp;girl&nbsp;&amp;&nbsp;boy*</div>
+<div class="diff_deleted">&lt;&nbsp;I&nbsp;want&nbsp;a&nbsp;pony!</div>
+<div class="diff_added">&gt;&nbsp;I&nbsp;hate&nbsp;ponies!</div>
+                </td>
+            </tr>
+            <tr>
+            <td colspan="2" id="footer">
+                <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+    <TR>
+        <TD width="50%">
+            
+            <a href="/sidebyside/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">Changed</a>
+            on
+            DATE
+            by
+            <a href="/search/Xpday?text=goodboy" rel="nofollow">goodboy</a>
+            
+        </TD>
+        <TD width="50%" align="right">
+            Contact the site administrator:
+            <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
+        </TD>
+    </TR>
+    <tr><td colspan="2"><hr></td></tr>
+    <tr>
+        <td><FORM action="/search/Xpday" method="post" id="search" name="search">
+                Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
+            </FORM>
+        </td>
+        <td>
+            
+        </td>
+    </tr>
+</TABLE>
+            </td>
+            </tr>
+        </table>
+        <span style="float:right">
+            <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/FrontPage">
+                <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
+        </span>
+    </BODY>
+</HTML>
+END_EXPECTED_DIFF
+    end
+    
+    def expected_sidebyside
+        return <<END_EXPECTED_SIDEBYSIDE
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+    <HEAD>
+        <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+        <META http-equiv="Pragma" content="no-cache">
+        <META name="Author" content="Pascal Van Cauwenberghe">
+        <META name="Keywords" content="ruby,wiki">
+        <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
+        <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
+        <TITLE>
+            
+            Xpday
+            -
+            
+            FrontPage
+        </TITLE>
+    </HEAD>
+    <BODY>
+        <table id="container">
+            <tr>
+                <td colspan="2" id="header">
+                    <TABLE border="0" cellpadding="0" cellspacing="0" width="95%" class="Header">
+                        <TR>
+                            <TD><h1><a href="/search/Xpday?text=FrontPage" rel="nofollow">FrontPage</a>
+                                    
+                                    <a href="/view/Xpday/FrontPage">v.1</a>
+                                    
+                                </h1>
+                            </TD>
+                            <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
+                        </TR>
+                    </TABLE>
+                </td>
+            </tr>
+            <tr>
+                <td id="menu" valign="top" nowrap>
+                    
+<ul>
+    <li>
+        <a href="/versions/Xpday/FrontPage" rel="nofollow">Page&nbsp;History</a>
+    </li>
+
+    <li>
+        <a href="/sidebyside/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">What&nbsp;changed?</a>
+    </li>
+
+    <li>
+        <a href="/diff/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">Diff</a>
+    </li>
+    <li>
+        <a href="/wikiedit/Xpday/FrontPage" rel="nofollow">Edit&nbsp;this&nbsp;page</a>
+    </li>
+</ul>
+<hr>
+
+<ul>
+    <li>
+        <a href="/changes/Xpday" rel="nofollow">Recent&nbsp;changes</a>
+    </li>
+    <li>
+        <a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
+    </li>
+</ul>
+                </td>
+                <td id="body" width="100%" valign="top">
+                    <table class="wikitable" width="100%"><tr><th><a href="/view/Xpday/FrontPage?version=0">FrontPage v0 (by goodgirl)</a></th><th><a href="/view/Xpday/FrontPage?version=1">FrontPage v1 (by goodboy)</a> <a href=\"/sidebyside/Xpday/FrontPage?from=0&amp;to=2\" rel="nofollow">&gt;&gt;</a></th></tr>
+<tr><td width='50%' valign='top'>start<br>edited by <STRONG>good girl &amp; boy</STRONG>
+I want a pony!</td><td width='50%' valign='top'>start<br />edited by <STRONG>good girl &amp; boy</STRONG>
+I hate ponies!</td></tr></table>
+                </td>
+            </tr>
+            <tr>
+            <td colspan="2" id="footer">
+                <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
+    <TR>
+        <TD width="50%">
+            
+            <a href="/sidebyside/Xpday/FrontPage?from=0&amp;to=1" rel="nofollow">Changed</a>
+            on
+            DATE
+            by
+            <a href="/search/Xpday?text=goodboy" rel="nofollow">goodboy</a>
+            
+        </TD>
+        <TD width="50%" align="right">
+            Contact the site administrator:
+            <a href="/view/Xpday/MailFormattingRules" rel="nofollow" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
+        </TD>
+    </TR>
+    <tr><td colspan="2"><hr></td></tr>
+    <tr>
+        <td><FORM action="/search/Xpday" method="post" id="search" name="search">
+                Search for <INPUT name="text" size="30" ID="Text1"> <input type="submit" name="Go" value="Go">
+            </FORM>
+        </td>
+        <td>
+            
+        </td>
+    </tr>
+</TABLE>
+            </td>
+            </tr>
+        </table>
+        <span style="float:right">
+            <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost/view/Xpday/FrontPage">
+                <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
+        </span>
+    </BODY>
+</HTML>
+END_EXPECTED_SIDEBYSIDE
+    end
+    
+
+    
 end