deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added assertion about wanted pages to All pages test, im proved handling of page names that need escaping by Watir test

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-05-29 00:02:54 +00:00
parent 5ef861f779
commit 62f5be7b35
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
test/watir/e2e.rb
View file

@ -1,4 +1,5 @@
require 'fileutils' require 'fileutils'
require 'cgi'
require 'test/unit' require 'test/unit'
INSTIKI_ROOT = File.expand_path(File.dirname(__FILE__) + "/../..") INSTIKI_ROOT = File.expand_path(File.dirname(__FILE__) + "/../..")
@ -56,13 +57,13 @@ class E2EInstikiTest < Test::Unit::TestCase
def test_00020_add_a_page def test_00020_add_a_page
# Add reference to a non-existant wiki page # Add reference to a non-existant wiki page
enter_markup('HomePage', '[[Another Wiki Page]]') enter_markup('HomePage', '[[Another Wiki Page]]')
assert_equal '?', ie.link(:url, url(:show, 'Another+Wiki+Page')).text assert_equal '?', ie.link(:url, url(:show, 'Another Wiki Page')).text
# Edit the first revision of a page # Edit the first revision of a page
enter_markup('Another+Wiki+Page', 'First revision of Another Wiki Page, linked from HomePage') enter_markup('Another Wiki Page', 'First revision of Another Wiki Page, linked from HomePage')
# Check contents of the new page # Check contents of the new page
assert_equal url(:show, 'Another+Wiki+Page'), ie.url assert_equal url(:show, 'Another Wiki Page'), ie.url
assert_match /First revision of Another Wiki Page, linked from Home Page/, ie.text assert_match /First revision of Another Wiki Page, linked from Home Page/, ie.text
assert_match /Linked from: Home Page/, ie.text assert_match /Linked from: Home Page/, ie.text
@ -135,7 +136,8 @@ class E2EInstikiTest < Test::Unit::TestCase
def test_0060_see_changes def test_0060_see_changes
ie.goto url(:show, 'TestEditPage') ie.goto url(:show, 'TestEditPage')
assert ie.html.include?('<P>Test Edit Page, revision <DEL class=diffmod>2</DEL><INS class=diffmod>2, rolled back</INS></P>') assert ie.html.include?('<P>Test Edit Page, revision <DEL class=diffmod>2</DEL>' +
'<INS class=diffmod>2, rolled back</INS></P>')
assert_match /Test Edit Page, revision 2, rolled back/, ie.text assert_match /Test Edit Page, revision 2, rolled back/, ie.text
ie.link(:text, 'See changes').click ie.link(:text, 'See changes').click
@ -149,16 +151,22 @@ class E2EInstikiTest < Test::Unit::TestCase
end end
def test_0070_all_pages def test_0070_all_pages
# create a wanted page, and unlink Another Wiki Page from Home Page
# (to see that it doesn't show up in the orphans, regardless)
enter_markup('Another Wiki Page', 'Reference to a NonExistantPage')
ie.link(:text, 'All Pages').click ie.link(:text, 'All Pages').click
page_links = ie.links.map { |l| l.text } page_links = ie.links.map { |l| l.text }
expected_page_links = ['Another Wiki Page', 'Home Page', 'Test Edit Page', 'Test Edit Page'] expected_page_links = ['Another Wiki Page', 'Home Page', 'Test Edit Page', '?',
assert_equal expected_page_links, page_links[-4..-1] 'Another Wiki Page', 'Test Edit Page']
assert_equal expected_page_links, page_links[-6..-1]
links_sequence = 'All Pages.*Another Wiki Page.*Home Page.*Test Edit Page.*' +
'Wanted Pages.*Non Existant Page\? wanted by Another Wiki Page.*'+
'Orphaned Pages.*Test Edit Page.*'
assert_match Regexp.new(links_sequence, Regexp::MULTILINE), ie.text
# and before that, we have the tail of the main menu # and before that, we have the tail of the main menu
assert_equal 'Export', page_links[-5] assert_equal 'Export', page_links[-7]
# Test Edit Page link is repeated twice, because it is an orphan
assert_match Regexp.new('Test Edit Page.*Orphaned Pages.*Test Edit Page', Regexp::MULTILINE),
ie.text
end end
private private
@ -229,6 +237,7 @@ class E2EInstikiTest < Test::Unit::TestCase
end end
def url(operation, page_name = nil, revision = nil) def url(operation, page_name = nil, revision = nil)
page_name = CGI.escape(page_name)
case operation case operation
when :edit, :new, :show, :print, :revision, :rollback when :edit, :new, :show, :print, :revision, :rollback
"#{HOME}/wiki/#{operation}/#{page_name}" + (revision ? "?rev=#{revision}" : '') "#{HOME}/wiki/#{operation}/#{page_name}" + (revision ? "?rev=#{revision}" : '')