Permalink
Browse files

Fix failing system tests for new markup

  • Loading branch information...
1 parent 5f9f563 commit 0a9a14b37f5528674cfc121e24ca5c85fdd3ece0 @dextercowley dextercowley committed Sep 27, 2012
@@ -265,7 +265,7 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`,
(75, 166, 22, 23, 24, 5, 'sample-data-articles/joomla/extensions/modules/navigation-modules', 'com_content', 'Navigation Modules', 'navigation-modules', '', '<p>Navigation modules help your visitors move through your site and find what they need.</p>\r\n<p>Menus provide your site with structure and help your visitors navigate your site. Although they are all based on the same menu module, the variety of ways menus are used in the sample data show how flexible this module is.</p>\r\n<p>A menu can range from extremely simple (for example the top menu or the menu for the Australian Parks sample site) to extremely complex (for example the About Joomla! menu with its many levels). They can also be used for other types of presentation such as the site map linked from the "This Site" menu.</p>\r\n<p>Breadcrumbs provide users with information about where they are in a site.</p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 123, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1),
(76, 167, 29, 55, 56, 3, 'sample-data-articles/fruit-shop-site/recipes', 'com_content', 'Recipes', 'recipes', '', '<p>Customers and suppliers can post their favorite recipes for fruit here.</p>\r\n<p>A good idea is to promote the use of metadata keywords to make finding other recipes for the same fruit easier.</p>\r\n<p><em>To see this in action, create a user assigned to the customer group and a user assigned to the suppliers group. These users will be able to create their own recipe pages and edit those pages. They will not be able to edit other users'' pages.</em><br /><br /></p>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 123, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1),
(77, 169, 1, 135, 136, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 123, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1),
-(78, 174, 23, 33, 34, 5, 'sample-data-articles/joomla/extensions/templates/protostar', 'com_content', 'Protostar', 'protostar', '', '<p>Protostar is a mobile ready template designed using Twitter Bootstrap. It is sleek and easily to customise. It is the default template for Joomla 3.</p>\r\n<ul>\r\n<li><a href="index.php?Itemid=469">Home Page</a></li>\r\n<li><a href="index.php?option=com_content&amp;view=article&amp;id=49&amp;catid=23&amp;Itemid=470">Typography</a></li>\r\n</ul>', 1, 123, '2012-09-25 12:13:14', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 123, '2012-09-25 11:50:03', 123, '2012-09-25 12:13:14', 0, '*', 1);
+(78, 174, 23, 33, 34, 5, 'sample-data-articles/joomla/extensions/templates/protostar', 'com_content', 'Protostar', 'protostar', '', '<p>Protostar is a mobile ready template designed using Twitter Bootstrap. It is sleek and easily to customise. It is the default template for Joomla 3.</p>\r\n<ul>\r\n<li><a href="index.php?Itemid=469">Home Page</a></li>\r\n<li><a href="index.php?option=com_content&amp;view=article&amp;id=49&amp;catid=23&amp;Itemid=470">Typography</a></li>\r\n</ul>', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 123, '2012-09-25 11:50:03', 123, '2012-09-25 12:13:14', 0, '*', 1);
INSERT IGNORE INTO `#__contact_details` (`id`, `name`, `alias`, `con_position`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `email_to`, `default_con`, `published`, `checked_out`, `checked_out_time`, `ordering`, `params`, `user_id`, `catid`, `access`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`, `version`, `hits`) VALUES
(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '<p>Information about or by the contact.</p>', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0),
View
@@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
+26-Sep-2012 Mark Dexter
+ # Fix a few more system tests
+
20-Sep-2012 Mark Dexter
# Fix some more system tests
@@ -22,9 +22,9 @@ function testBatchAcessLevels()
$this->click("link=Article Manager");
$this->waitForPageToLoad("30000");
echo "Check that first three articles are Public Access Level\n";
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.1.4"));
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.2.4"));
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.3.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.1.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.2.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.3.4"));
echo "Select first three articles\n";
$this->click("cb0");
$this->click("cb1");
@@ -37,9 +37,9 @@ function testBatchAcessLevels()
$this->assertTrue($this->isElementPresent("//div[@id=\"system-message\"][contains(., 'success')]"));
echo "Check that first three articles are Special Access Level\n";
- $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']/table.1.4"));
- $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']/table.2.4"));
- $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']/table.3.4"));
+ $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']//table.1.4"));
+ $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']//table.2.4"));
+ $this->assertEquals("Special", $this->getTable("//form[@id='adminForm']//table.3.4"));
echo "Change back to Public and check\n";
$this->click("cb0");
$this->click("cb1");
@@ -49,9 +49,9 @@ function testBatchAcessLevels()
$this->waitForPageToLoad("30000");
echo "Check for success message\n";
$this->assertTrue($this->isElementPresent("//div[@id=\"system-message\"][contains(., 'success')]"));
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.1.4"));
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.2.4"));
- $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']/table.3.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.1.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.2.4"));
+ $this->assertEquals("Public", $this->getTable("//form[@id='adminForm']//table.3.4"));
echo "Finished testBatchAcessLevels\n";
@@ -67,9 +67,9 @@ function testBatchCopy()
$this->click("link=Article Manager");
$this->waitForPageToLoad("30000");
echo "Check that first three articles are as expected\n";
- $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']/table.1.3"));
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
+ $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']//table.1.3"));
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
echo "Select first three articles and batch copy to Park Site\n";
$this->click("cb0");
$this->click("cb1");
@@ -83,9 +83,9 @@ function testBatchCopy()
echo "Check that new articles are in Park Site category\n";
$this->select("filter_category_id", "label=- Park Site");
$this->waitForPageToLoad("30000");
- $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']/table.1.3"));
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
+ $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']//table.1.3"));
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
echo "Trash and delete new articles\n";
$this->click("cb0");
$this->click("cb1");
@@ -103,13 +103,13 @@ function testBatchCopy()
$this->waitForPageToLoad("30000");
echo "Check that first three articles are as expected\n";
- $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']/table.1.3"));
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
+ $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']//table.1.3"));
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
echo "Test copying to same category\n";
echo "Select first article and copy to Components\n";
- $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']/table.1.3"));
+ $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']//table.1.3"));
$this->click("cb0");
$this->click("batch[move_copy]c");
$this->select("batch-category-id", "label=- - - Components");
@@ -118,7 +118,7 @@ function testBatchCopy()
echo "Check for success message\n";
$this->assertTrue($this->isElementPresent("//div[@id=\"system-message\"][contains(., 'success')]"));
echo "Check that new article is created with correct name and alias\n";
- $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']/table.2.3"));
+ $this->assertStringStartsWith('Administrator Components', $this->getTable("//form[@id='adminForm']//table.2.3"));
echo "Trash and delete new article\n";
$this->click("cb1");
$this->click("//div[@id='toolbar-trash']/button");
@@ -145,12 +145,12 @@ function testBatchMove()
$this->click("link=Article Manager");
$this->waitForPageToLoad("30000");
echo "Check initial values for articles";
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
- $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']/table.4.3"));
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.2.3"), 'Category: Content Modules') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.3.3"), 'Category: Content Modules') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.4.3"), 'Category: Content Modules') > 0);
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
+ $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']//table.4.3"));
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.2.3"), 'Category: Content Modules') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.3.3"), 'Category: Content Modules') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.4.3"), 'Category: Content Modules') > 0);
echo "Move Archive Module, Content Modules, Article Categories Module to Languages Category\n";
$this->click("cb1");
$this->click("cb2");
@@ -161,12 +161,12 @@ function testBatchMove()
echo "Check for success message\n";
$this->assertTrue($this->isElementPresent("//div[@id=\"system-message\"][contains(., 'success')]"));
echo "Check that articles moved to new category\n";
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
- $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']/table.4.3"));
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.2.3"), 'Category: Languages') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.3.3"), 'Category: Languages') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.4.3"), 'Category: Languages') > 0);
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
+ $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']//table.4.3"));
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.2.3"), 'Category: Languages') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.3.3"), 'Category: Languages') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.4.3"), 'Category: Languages') > 0);
echo "Move articles back to original category\n";
$this->click("cb1");
$this->click("cb2");
@@ -177,12 +177,12 @@ function testBatchMove()
echo "Check for success message\n";
$this->assertTrue($this->isElementPresent("//div[@id=\"system-message\"][contains(., 'success')]"));
echo "Check that articles are back to original category\n";
- $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']/table.2.3"));
- $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']/table.3.3"));
- $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']/table.4.3"));
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.2.3"), 'Category: Content Modules') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.3.3"), 'Category: Content Modules') > 0);
- $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']/table.4.3"), 'Category: Content Modules') > 0);
+ $this->assertStringStartsWith('Archive Module', $this->getTable("//form[@id='adminForm']//table.2.3"));
+ $this->assertStringStartsWith('Article Categories Module', $this->getTable("//form[@id='adminForm']//table.3.3"));
+ $this->assertStringStartsWith('Articles Category Module', $this->getTable("//form[@id='adminForm']//table.4.3"));
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.2.3"), 'Category: Content Modules') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.3.3"), 'Category: Content Modules') > 0);
+ $this->assertTrue(strpos($this->getTable("//form[@id='adminForm']//table.4.3"), 'Category: Content Modules') > 0);
echo "Finished testBatchMove\n";
Oops, something went wrong. Retry.

0 comments on commit 0a9a14b

Please sign in to comment.