Wiki2Go 1.16.1 → 1.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. data/lib/Web2Go/CGIRequest.rb +40 -8
  2. data/lib/Web2Go/MockRequest.rb +11 -2
  3. data/lib/Web2Go/WebrickRequest.rb +4 -0
  4. data/lib/Wiki2Go/DotGraphics.rb +1 -1
  5. data/lib/Wiki2Go/Install/config/chonqed_blacklist.txt +1537 -13
  6. data/lib/Wiki2Go/Install/config/mime.types.conf +49 -0
  7. data/lib/Wiki2Go/Install/config/passwords +1 -1
  8. data/lib/Wiki2Go/Install/make_repository.rb +3 -2
  9. data/lib/Wiki2Go/Install/make_site.rb +222 -19
  10. data/lib/Wiki2Go/Install/site/error.html +52 -52
  11. data/lib/Wiki2Go/Install/templates/admin_pages/commit_site.txt +5 -1
  12. data/lib/Wiki2Go/Install/templates/admin_pages/edit.txt +8 -2
  13. data/lib/Wiki2Go/Install/templates/admin_pages/editfiles.txt +52 -7
  14. data/lib/Wiki2Go/Install/templates/admin_pages/greylist.txt +6 -3
  15. data/lib/Wiki2Go/Install/templates/admin_pages/passwords.txt +5 -2
  16. data/lib/Wiki2Go/Install/templates/admin_pages/regenerate.txt +4 -1
  17. data/lib/Wiki2Go/Install/templates/admin_pages/removespam.txt +4 -1
  18. data/lib/Wiki2Go/Install/templates/admin_pages/show_log.txt +5 -1
  19. data/lib/Wiki2Go/Install/templates/admin_pages/update_blacklist.txt +4 -1
  20. data/lib/Wiki2Go/Install/templates/admin_pages/update_conflicts.txt +4 -1
  21. data/lib/Wiki2Go/Install/templates/admin_pages/update_site.txt +5 -1
  22. data/lib/Wiki2Go/Install/templates/full_footer.htm +2 -2
  23. data/lib/Wiki2Go/Install/templates/simple_footer.htm +1 -1
  24. data/lib/Wiki2Go/LineFormatter.rb +41 -31
  25. data/lib/Wiki2Go/Web.rb +1 -22
  26. data/lib/Wiki2Go/Wiki2GoServlet.rb +11 -4
  27. data/test/TestFormatter.rb +11 -11
  28. data/test/TestLineFormatter.rb +37 -37
  29. data/test/TestRepositoryMaker.rb +1 -1
  30. data/test/TestWeb.rb +3 -4
  31. data/test/TestWeb2Go.rb +5 -6
  32. data/test/TestWiki2GoServlet.rb +95 -74
  33. data/test/testdata/expected_edit.html +10 -10
  34. data/test/testdata/expected_out.html +22 -22
  35. data/test/testdata/expected_put.html +10 -10
  36. data/test/testdata/expected_save.html +11 -11
  37. data/test/testdata/expected_savehtml.html +11 -11
  38. data/test/testdata/expected_search.html +8 -8
  39. data/test/testdata/expected_upload.html +11 -11
  40. data/test/testdata/expected_view.html +22 -22
  41. metadata +3 -2
data/test/TestWiki2GoServlet.rb CHANGED
@@ -136,6 +136,27 @@ class TestWiki2GoServlet < Test::Unit::TestCase
136
136
  assert_same_markup_strings(expected_upload,response.body,{ "DATE" => Time.new.strftime("%d/%m/%Y") })
137
137
  end
138
138
 
139
+ def test_upload_with_IE
140
+
141
+ request = Web2Go::MockRequest.new('http://localhost:8088/upload/NonExistingWeb/UploadPage')
142
+ request.upload_file("FILE","c:\\users\\pvc\\image.gif","An image")
143
+ response = Web2Go::MockResponse.new
144
+
145
+ servlet = Wiki2Go::Servlet.new(@config)
146
+
147
+ assert servlet.execute(request,response)
148
+ assert_equal('text/html',response.content_type)
149
+ assert_equal('Redirect to http://localhost:8088/view/NonExistingWeb/UploadPage',response.body)
150
+ assert_equal('http://localhost:8088/view/NonExistingWeb/UploadPage',response.redirect_to)
151
+
152
+ request = Web2Go::MockRequest.new(response.redirect_to)
153
+ assert servlet.execute(request,response)
154
+
155
+ assert_equal('text/html',response.content_type)
156
+ assert_same_markup_strings(expected_upload,response.body,{ "DATE" => Time.new.strftime("%d/%m/%Y") })
157
+ end
158
+
159
+
139
160
  def test_versions
140
161
 
141
162
  testpage = 'VersionPage'
@@ -211,8 +232,8 @@ END_EXPECTED_STATIC_HTML
211
232
  <META http-equiv="Pragma" content="no-cache">
212
233
  <META name="Author" content="Pascal Van Cauwenberghe">
213
234
  <META name="Keywords" content="ruby,wiki">
214
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
215
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
235
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
236
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
216
237
  <TITLE>NonExistingWeb-FrontPage</TITLE>
217
238
  </HEAD>
218
239
  <BODY>
@@ -222,9 +243,9 @@ END_EXPECTED_STATIC_HTML
222
243
  <TD>
223
244
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
224
245
  <TR>
225
- <TD><h1><a href="search/NonExistingWeb?text=FrontPage">FrontPage</a></h1>
246
+ <TD><h1><a href="/search/NonExistingWeb?text=FrontPage">FrontPage</a></h1>
226
247
  </TD>
227
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
248
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
228
249
  </TR>
229
250
  </TABLE>
230
251
  <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
@@ -236,18 +257,18 @@ END_EXPECTED_STATIC_HTML
236
257
  </TABLE>
237
258
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
238
259
  <TR>
239
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
240
- <TD width="50%"><a href="edit/NonExistingWeb/FrontPage">Edit this page</a></TD>
260
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
261
+ <TD width="50%"><a href="/edit/NonExistingWeb/FrontPage">Edit this page</a></TD>
241
262
  </TR>
242
263
  <TR>
243
264
  <TD width="50%">
244
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
265
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
245
266
  Search: <INPUT name="text" size="30" ID="Text1">
246
267
  </FORM>
247
268
  </TD>
248
269
  <TD width="50%">
249
270
 
250
- <FORM METHOD="POST" ACTION="upload/NonExistingWeb/FrontPage" ENCTYPE="multipart/form-data">
271
+ <FORM METHOD="POST" ACTION="/upload/NonExistingWeb/FrontPage" ENCTYPE="multipart/form-data">
251
272
  File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
252
273
  <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
253
274
  </FORM>
@@ -259,12 +280,12 @@ END_EXPECTED_STATIC_HTML
259
280
  </TR>
260
281
  <TR>
261
282
  <td>Changed on DATE by unknown
262
- <a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
283
+ <a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
263
284
  </td>
264
285
  <TD align="right">
265
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
286
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
266
287
  <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost:8088/view/NonExistingWeb/FrontPage">
267
- <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
288
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
268
289
  </TD>
269
290
  </TR>
270
291
  </TABLE>
@@ -287,8 +308,8 @@ END_EXPECTED_VIEW
287
308
  <META http-equiv="Pragma" content="no-cache">
288
309
  <META name="Author" content="Pascal Van Cauwenberghe">
289
310
  <META name="Keywords" content="ruby,wiki">
290
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
291
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
311
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
312
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
292
313
  <TITLE>NonExistingWeb-SavePage</TITLE>
293
314
  </HEAD>
294
315
  <BODY>
@@ -298,9 +319,9 @@ END_EXPECTED_VIEW
298
319
  <TD>
299
320
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
300
321
  <TR>
301
- <TD><h1><a href="search/NonExistingWeb?text=SavePage">SavePage</a></h1>
322
+ <TD><h1><a href="/search/NonExistingWeb?text=SavePage">SavePage</a></h1>
302
323
  </TD>
303
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
324
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
304
325
  </TR>
305
326
  </TABLE>
306
327
  <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
@@ -312,18 +333,18 @@ some text to save saying <%= 3.to_s %> or <%= @request.parameter("reqparam","no
312
333
  </TABLE>
313
334
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
314
335
  <TR>
315
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
316
- <TD width="50%"><a href="edit/NonExistingWeb/SavePage">Edit this page</a></TD>
336
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
337
+ <TD width="50%"><a href="/edit/NonExistingWeb/SavePage">Edit this page</a></TD>
317
338
  </TR>
318
339
  <TR>
319
340
  <TD width="50%">
320
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
341
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
321
342
  Search: <INPUT name="text" size="30" ID="Text1">
322
343
  </FORM>
323
344
  </TD>
324
345
  <TD width="50%">
325
346
 
326
- <FORM METHOD="POST" ACTION="upload/NonExistingWeb/SavePage" ENCTYPE="multipart/form-data">
347
+ <FORM METHOD="POST" ACTION="/upload/NonExistingWeb/SavePage" ENCTYPE="multipart/form-data">
327
348
  File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
328
349
  <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
329
350
  </FORM>
@@ -335,12 +356,12 @@ some text to save saying <%= 3.to_s %> or <%= @request.parameter("reqparam","no
335
356
  </TR>
336
357
  <TR>
337
358
  <td>Changed on DATE by pvc
338
- <a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
359
+ <a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
339
360
  </td>
340
361
  <TD align="right">
341
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
362
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
342
363
  <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost:8088/view/NonExistingWeb/SavePage">
343
- <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
364
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
344
365
  </TD>
345
366
  </TR>
346
367
  </TABLE>
@@ -363,8 +384,8 @@ END_EXPECTED_VIEW
363
384
  <META http-equiv="Pragma" content="no-cache">
364
385
  <META name="Author" content="Pascal Van Cauwenberghe">
365
386
  <META name="Keywords" content="ruby,wiki">
366
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
367
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
387
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
388
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
368
389
  <TITLE>NonExistingWeb-SavePage</TITLE>
369
390
  </HEAD>
370
391
  <BODY>
@@ -374,9 +395,9 @@ END_EXPECTED_VIEW
374
395
  <TD>
375
396
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
376
397
  <TR>
377
- <TD><h1><a href="search/NonExistingWeb?text=SavePage">SavePage</a></h1>
398
+ <TD><h1><a href="/search/NonExistingWeb?text=SavePage">SavePage</a></h1>
378
399
  </TD>
379
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
400
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
380
401
  </TR>
381
402
  </TABLE>
382
403
  <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
@@ -388,18 +409,18 @@ some text to save saying 3 or okay!
388
409
  </TABLE>
389
410
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
390
411
  <TR>
391
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
392
- <TD width="50%"><a href="edit/NonExistingWeb/SavePage">Edit this page</a></TD>
412
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
413
+ <TD width="50%"><a href="/edit/NonExistingWeb/SavePage">Edit this page</a></TD>
393
414
  </TR>
394
415
  <TR>
395
416
  <TD width="50%">
396
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
417
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
397
418
  Search: <INPUT name="text" size="30" ID="Text1">
398
419
  </FORM>
399
420
  </TD>
400
421
  <TD width="50%">
401
422
 
402
- <FORM METHOD="POST" ACTION="upload/NonExistingWeb/SavePage" ENCTYPE="multipart/form-data">
423
+ <FORM METHOD="POST" ACTION="/upload/NonExistingWeb/SavePage" ENCTYPE="multipart/form-data">
403
424
  File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
404
425
  <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
405
426
  </FORM>
@@ -411,12 +432,12 @@ some text to save saying 3 or okay!
411
432
  </TR>
412
433
  <TR>
413
434
  <td>Changed on DATE by pvc
414
- <a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
435
+ <a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
415
436
  </td>
416
437
  <TD align="right">
417
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
438
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
418
439
  <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost:8088/view/NonExistingWeb/SavePage">
419
- <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
440
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
420
441
  </TD>
421
442
  </TR>
422
443
  </TABLE>
@@ -439,8 +460,8 @@ END_EXPECTED_PERFORM
439
460
  <META http-equiv="Pragma" content="no-cache">
440
461
  <META name="Author" content="Pascal Van Cauwenberghe">
441
462
  <META name="Keywords" content="ruby,wiki">
442
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
443
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
463
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
464
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
444
465
  <TITLE>NonExistingWeb-FrontPage</TITLE>
445
466
  </HEAD>
446
467
  <BODY>
@@ -450,9 +471,9 @@ END_EXPECTED_PERFORM
450
471
  <TD>
451
472
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
452
473
  <TR>
453
- <TD><h1><a href="search.pl/NonExistingWeb?text=FrontPage">FrontPage</a></h1>
474
+ <TD><h1><a href="/search.pl/NonExistingWeb?text=FrontPage">FrontPage</a></h1>
454
475
  </TD>
455
- <td align="right"><a href="view.pl/NonExistingWeb/FrontPage">Home</a></td>
476
+ <td align="right"><a href="/view.pl/NonExistingWeb/FrontPage">Home</a></td>
456
477
  </TR>
457
478
  </TABLE>
458
479
  <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
@@ -464,18 +485,18 @@ END_EXPECTED_PERFORM
464
485
  </TABLE>
465
486
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
466
487
  <TR>
467
- <TD width="50%"><a href="changes.pl/NonExistingWeb">Recent changes</a></TD>
468
- <TD width="50%"><a href="edit.pl/NonExistingWeb/FrontPage">Edit this page</a></TD>
488
+ <TD width="50%"><a href="/changes.pl/NonExistingWeb">Recent changes</a></TD>
489
+ <TD width="50%"><a href="/edit.pl/NonExistingWeb/FrontPage">Edit this page</a></TD>
469
490
  </TR>
470
491
  <TR>
471
492
  <TD width="50%">
472
- <FORM action="search.pl/NonExistingWeb" method="post" id="form1" name="form1">
493
+ <FORM action="/search.pl/NonExistingWeb" method="post" id="form1" name="form1">
473
494
  Search: <INPUT name="text" size="30" ID="Text1">
474
495
  </FORM>
475
496
  </TD>
476
497
  <TD width="50%">
477
498
 
478
- <FORM METHOD="POST" ACTION="upload.pl/NonExistingWeb/FrontPage" ENCTYPE="multipart/form-data">
499
+ <FORM METHOD="POST" ACTION="/upload.pl/NonExistingWeb/FrontPage" ENCTYPE="multipart/form-data">
479
500
  File: <INPUT TYPE="FILE" NAME="FILE" ID="File">
480
501
  <INPUT TYPE="SUBMIT" VALUE="Send" ID="SendFile" NAME="SendFile">
481
502
  </FORM>
@@ -487,12 +508,12 @@ END_EXPECTED_PERFORM
487
508
  </TR>
488
509
  <TR>
489
510
  <td>Changed on DATE by unknown
490
- <a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
511
+ <a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
491
512
  </td>
492
513
  <TD align="right">
493
- Contact the site administrator: <a href="view.pl/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
514
+ Contact the site administrator: <a href="/view.pl/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
494
515
  <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost:8088/view.pl/NonExistingWeb/FrontPage">
495
- <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
516
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
496
517
  </TD>
497
518
  </TR>
498
519
  </TABLE>
@@ -515,8 +536,8 @@ END_EXPECTED_VIEW
515
536
  <META http-equiv="Pragma" content="no-cache">
516
537
  <META name="Author" content="Pascal Van Cauwenberghe">
517
538
  <META name="Keywords" content="ruby,wiki">
518
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
519
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
539
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
540
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
520
541
  <TITLE>Versions of 'VersionPage'</TITLE>
521
542
  </HEAD>
522
543
  <BODY>
@@ -527,7 +548,7 @@ END_EXPECTED_VIEW
527
548
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
528
549
  <TR>
529
550
  <TD><H1>Versions of 'VersionPage'</H1></TD>
530
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
551
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
531
552
  </TR>
532
553
  </TABLE>
533
554
  <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
@@ -541,21 +562,21 @@ END_EXPECTED_VIEW
541
562
  <tr class="even">
542
563
  <td class="date">DATE</td>
543
564
  <td class="author">thirduser</td>
544
- <td><a href="view/NonExistingWeb/VersionPage?version=2">view</a></td>
565
+ <td><a href="/view/NonExistingWeb/VersionPage?version=2">view</a></td>
545
566
 
546
567
  </tr>
547
568
 
548
569
  <tr class="odd">
549
570
  <td class="date">&nbsp;</td>
550
571
  <td class="author">seconduser</td>
551
- <td><a href="view/NonExistingWeb/VersionPage?version=1">view</a></td>
572
+ <td><a href="/view/NonExistingWeb/VersionPage?version=1">view</a></td>
552
573
 
553
574
  </tr>
554
575
 
555
576
  <tr class="even">
556
577
  <td class="date">&nbsp;</td>
557
578
  <td class="author">firstuser</td>
558
- <td><a href="view/NonExistingWeb/VersionPage?version=0">view</a></td>
579
+ <td><a href="/view/NonExistingWeb/VersionPage?version=0">view</a></td>
559
580
 
560
581
  </tr>
561
582
 
@@ -568,17 +589,17 @@ END_EXPECTED_VIEW
568
589
  </TABLE>
569
590
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
570
591
  <TR>
571
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
592
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
572
593
  <TD width="50%">
573
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
594
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
574
595
  Search: <INPUT name="text" size="30" ID="Text1">
575
596
  </FORM>
576
597
  </TD>
577
598
  </TR>
578
599
  <TR>
579
- <td><a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
600
+ <td><a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
580
601
  <TD align="right">
581
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
602
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
582
603
  </TD>
583
604
  </TR>
584
605
  </TABLE>
@@ -602,8 +623,8 @@ END_EXPECTED_VERSIONS
602
623
  <META http-equiv="Pragma" content="no-cache">
603
624
  <META name="Author" content="Pascal Van Cauwenberghe">
604
625
  <META name="Keywords" content="ruby,wiki">
605
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
606
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
626
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
627
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
607
628
  <TITLE>Recent Changes</TITLE>
608
629
  </HEAD>
609
630
  <BODY>
@@ -614,7 +635,7 @@ END_EXPECTED_VERSIONS
614
635
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
615
636
  <TR>
616
637
  <TD><H1>Recent Changes</H1></TD>
617
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
638
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
618
639
  </TR>
619
640
  </TABLE>
620
641
  <TABLE border="0" cellpadding="0" cellspacing="8" width="100%" class="Body">
@@ -627,14 +648,14 @@ END_EXPECTED_VERSIONS
627
648
 
628
649
  <tr class="even">
629
650
  <td class="date">DATE</td>
630
- <td class="topic"><a href="view/NonExistingWeb/page_one">page_one</a></td>
651
+ <td class="topic"><a href="/view/NonExistingWeb/page_one">page_one</a></td>
631
652
  <td class="author">the_author</td>
632
653
 
633
654
  </tr>
634
655
 
635
656
  <tr class="odd">
636
657
  <td class="date">&nbsp;</td>
637
- <td class="topic"><a href="view/NonExistingWeb/page_two">page_two</a></td>
658
+ <td class="topic"><a href="/view/NonExistingWeb/page_two">page_two</a></td>
638
659
  <td class="author">another author</td>
639
660
 
640
661
  </tr>
@@ -648,17 +669,17 @@ END_EXPECTED_VERSIONS
648
669
  </TABLE>
649
670
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
650
671
  <TR>
651
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
672
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
652
673
  <TD width="50%">
653
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
674
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
654
675
  Search: <INPUT name="text" size="30" ID="Text1">
655
676
  </FORM>
656
677
  </TD>
657
678
  </TR>
658
679
  <TR>
659
- <td><a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
680
+ <td><a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
660
681
  <TD align="right">
661
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
682
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
662
683
  </TD>
663
684
  </TR>
664
685
  </TABLE>
@@ -682,8 +703,8 @@ def expected_upload
682
703
  <META http-equiv="Pragma" content="no-cache">
683
704
  <META name="Author" content="Pascal Van Cauwenberghe">
684
705
  <META name="Keywords" content="ruby,wiki">
685
- <LINK rel="stylesheet" href="html/NonExistingWeb/style.css" type="text/css">
686
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/NonExistingWeb/rss.xml">
706
+ <LINK rel="stylesheet" href="/html/NonExistingWeb/style.css" type="text/css">
707
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/NonExistingWeb/rss.xml">
687
708
  <TITLE>NonExistingWeb-UploadPage</TITLE>
688
709
  </HEAD>
689
710
  <BODY>
@@ -693,9 +714,9 @@ def expected_upload
693
714
  <TD>
694
715
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
695
716
  <TR>
696
- <TD><h1><a href="search/NonExistingWeb?text=UploadPage">UploadPage</a></h1>
717
+ <TD><h1><a href="/search/NonExistingWeb?text=UploadPage">UploadPage</a></h1>
697
718
  </TD>
698
- <td align="right"><a href="view/NonExistingWeb/FrontPage">Home</a></td>
719
+ <td align="right"><a href="/view/NonExistingWeb/FrontPage">Home</a></td>
699
720
  </TR>
700
721
  </TABLE>
701
722
  <TABLE border="0" cellpadding="8" cellspacing="0" width="100%" class="Body">
@@ -703,18 +724,18 @@ def expected_upload
703
724
  <TD width="100%">
704
725
  <p>
705
726
  <hr>
706
- <img src="html/NonExistingWeb/image.gif" border=0 alt="image" >
727
+ <img src="/html/NonExistingWeb/image.gif" border=0 alt="image" >
707
728
  </TD>
708
729
  </TR>
709
730
  </TABLE>
710
731
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer">
711
732
  <TR>
712
- <TD width="50%"><a href="changes/NonExistingWeb">Recent changes</a></TD>
713
- <TD width="50%"><a href="edit/NonExistingWeb/UploadPage">Edit this page</a></TD>
733
+ <TD width="50%"><a href="/changes/NonExistingWeb">Recent changes</a></TD>
734
+ <TD width="50%"><a href="/edit/NonExistingWeb/UploadPage">Edit this page</a></TD>
714
735
  </TR>
715
736
  <TR>
716
737
  <TD width="50%">
717
- <FORM action="search/NonExistingWeb" method="post" id="form1" name="form1">
738
+ <FORM action="/search/NonExistingWeb" method="post" id="form1" name="form1">
718
739
  Search: <INPUT name="text" size="30" ID="Text1">
719
740
  </FORM>
720
741
  </TD>
@@ -727,12 +748,12 @@ def expected_upload
727
748
  </TR>
728
749
  <TR>
729
750
  <td>Changed on DATE by pvc
730
- <a href="html/NonExistingWeb/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
751
+ <a href="/html/NonExistingWeb/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep up to date"></a>
731
752
  </td>
732
753
  <TD align="right">
733
- Contact the site administrator: <a href="view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
754
+ Contact the site administrator: <a href="/view/NonExistingWeb/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
734
755
  <a target="_blank" href="http://validator.w3.org/check?uri=http://localhost:8088/view/NonExistingWeb/UploadPage">
735
- <img border="0" src="html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
756
+ <img border="0" src="/html/valid-html401.png" alt="Verify if layout is correct!" height="31" width="88"></a>
736
757
  </TD>
737
758
  </TR>
738
759
  </TABLE>
data/test/testdata/expected_edit.html CHANGED
@@ -7,8 +7,8 @@
7
7
  <META http-equiv="Pragma" content="no-cache">
8
8
  <META name="Author" content="Pascal Van Cauwenberghe">
9
9
  <META name="Keywords" content="ruby,wiki">
10
- <LINK rel="stylesheet" href="html/Xpday/style.css" type="text/css">
11
- <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="html/Xpday/rss.xml">
10
+ <LINK rel="stylesheet" href="/html/Xpday/style.css" type="text/css">
11
+ <LINK rel="alternate" type="application/rss+xml" title="RSS 2.0 feed" href="/html/Xpday/rss.xml">
12
12
  <TITLE>Edit
13
13
  Xpday
14
14
  -
@@ -23,20 +23,20 @@
23
23
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Header">
24
24
  <TR>
25
25
  <TD><H1>Edit
26
- <a href="search/Xpday?text=FrontPage">FrontPage</a>
26
+ <a href="/search/Xpday?text=FrontPage">FrontPage</a>
27
27
  </H1>
28
28
  </TD>
29
- <td align="right"><a href="view/Xpday/FrontPage">Home</a></td>
29
+ <td align="right"><a href="/view/Xpday/FrontPage">Home</a></td>
30
30
  </TR>
31
31
  </TABLE>
32
32
  <table border="0" cellpadding="0" cellspacing="0" width="100%" class="Body">
33
33
  <tr>
34
34
  <td width="100%">
35
- <form action="save/Xpday/FrontPage" method="POST" id="form2" name="form2">
35
+ <form action="/save/Xpday/FrontPage" method="POST" id="form2" name="form2">
36
36
  <p align="left">Edit the page in the text area.
37
37
  <br>
38
38
  To quit without changing the page,
39
- <a href="view/Xpday/FrontPage">click here to return to FrontPage</a>
39
+ <a href="/view/Xpday/FrontPage">click here to return to FrontPage</a>
40
40
  </p>
41
41
 
42
42
  <p align="left">Author name: <input type="text" name="author" value="unknown" size="64"><input type="checkbox" name="remember_me" value="on" checked>Remember me</p>
@@ -83,17 +83,17 @@ XP Day Benelux is an %Organisation% of AgileSystems vzwFor more information, the
83
83
  </table>
84
84
  <TABLE border="0" cellpadding="0" cellspacing="0" width="100%" class="Footer" ID="Table1">
85
85
  <TR>
86
- <TD width="50%"><a href="changes/Xpday">Recent changes</a></TD>
86
+ <TD width="50%"><a href="/changes/Xpday">Recent changes</a></TD>
87
87
  <TD width="50%">
88
- <FORM action="search/Xpday" method="post" id="form1" name="form1">
88
+ <FORM action="/search/Xpday" method="post" id="form1" name="form1">
89
89
  Search: <INPUT name="text" size="30" ID="Text1">
90
90
  </FORM>
91
91
  </TD>
92
92
  </TR>
93
93
  <TR>
94
- <td><a href="html/Xpday/rss.xml"><img src="html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
94
+ <td><a href="/html/Xpday/rss.xml"><img src="/html/rssLogo.png" width="36" height="14" border="0" alt="Keep informed"></a></td>
95
95
  <TD align="right">
96
- Contact the site administrator: <a href="view/Xpday/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
96
+ Contact the site administrator: <a href="/view/Xpday/MailFormattingRules" onmouseover="this.href='mai' + 'lto:' + 'wiki2go' + '&#64;' + 'nayima.be'">wiki2go</a>
97
97
  </TD>
98
98
  </TR>
99
99
  </TABLE>