Fix issue #36

tests/_support/Page/Acceptance/Administrator/ArticleManagerPage.php

@@ -15,6 +15,6 @@ class ArticleManagerPage extends AdminPage
 
     public static $iconSearch = ['class' => 'icon-search'];
 
-    public static $pageURL = "/administrator/index.php?option=com_content&view=articles";
+    public static $url = "/administrator/index.php?option=com_content&view=articles";
 
 }

tests/_support/Page/Acceptance/Administrator/LoginPage.php

@@ -13,5 +13,5 @@ class LoginPage extends AdminPage
 
     public static $loginButton = ['css' => 'button[data-tests="log in"]'];
 
-    public static $pageURL = "/administrator/index.php";
+    public static $url = "/administrator/index.php";
 }

tests/_support/Page/Acceptance/Administrator/UserAclPage.php

@@ -6,6 +6,6 @@
 class UserAclPage extends AdminPage
 {
     // include url of current page
-    public static $aclPageURL = 'administrator/index.php?option=com_users&view=levels';
+    public static $url = 'administrator/index.php?option=com_users&view=levels';
 
 }

tests/_support/Page/Acceptance/Administrator/UserGroupPage.php

@@ -6,7 +6,7 @@
 class UserGroupPage extends AdminPage
 {
     // include url of current page
-    public static $groupPageURL = 'administrator/index.php?option=com_users&view=groups';
+    public static $url = 'administrator/index.php?option=com_users&view=groups';
 
 
 }

tests/_support/Page/Acceptance/Administrator/UserManagerPage.php

@@ -21,5 +21,5 @@ class UserManagerPage extends AdminPage
 
     public static $title = ['id' => 'jform_title'];
 
-    public static $pageURL = "administrator/index.php?option=com_users&view=users";
+    public static $url = "administrator/index.php?option=com_users&view=users";
 }

tests/_support/Step/Acceptance/Administrator/Content.php

@@ -12,7 +12,7 @@ class Content extends \AcceptanceTester
 	public function thereIsAAddContentLink()
 	{
 		$I = $this;
-		$I->amOnPage(ArticleManagerPage::$pageURL);
+		$I->amOnPage(ArticleManagerPage::$url);
 		$I->clickToolbarButton('New');
 	}
 
@@ -37,12 +37,12 @@ public function iSaveAnArticle()
 	}
 
 	/**
-	 * @Then I wait for the title :title and  see the message :message
+	 * @Then I should see the :arg1 message
 	 */
-	public function iShouldSeeTheMessage($title, $message)
+	public function iShouldSeeTheMessage($message)
 	{
 		$I = $this;
-		$I->waitForPageTitle($title);
+		$I->waitForText($message, 60, AdminPage::$systemMessageContainer);
 		$I->see($message, AdminPage::$systemMessageContainer);
 	}
 
@@ -52,7 +52,7 @@ public function iShouldSeeTheMessage($title, $message)
 	public function iSearchAndSelectContentArticleWithTitle($title)
 	{
 		$I = $this;
-		$I->amOnPage(ArticleManagerPage::$pageURL);
+		$I->amOnPage(ArticleManagerPage::$url);
 		$I->fillField(ArticleManagerPage::$filterSearch, $title);
 		$I->click(ArticleManagerPage::$iconSearch);
 		$I->checkAllResults();
@@ -67,23 +67,13 @@ public function iFeatureTheContentWithTitle()
 		$I->clickToolbarButton('featured');
 	}
 
-	/**
-	 * @Then I save and see the :arg1 message
-	 */
-	/*public function iSaveAndSeeTheMessage($message)
-	{
-		$I = $this;
-		$I->waitForPageTitle($message, AdminPage::$systemMessageContainer);
-		$I->see($message, AdminPage::$systemMessageContainer);
-	}*/
-
 	/**
 	 * @Given I select the content article with title :arg1
 	 */
 	public function iSelectTheContentArticleWithTitle($title)
 	{
 		$I = $this;
-		$I->amOnPage(ArticleManagerPage::$pageURL);
+		$I->amOnPage(ArticleManagerPage::$url);
 		$I->fillField(ArticleManagerPage::$filterSearch, $title);
 		$I->click(ArticleManagerPage::$iconSearch);
 		$I->checkAllResults();
@@ -109,12 +99,12 @@ public function iSaveTheArticle()
 	}
 
 	/**
-	 * @Given I have article with name :arg1
+	 * @Given I have article with name :title
 	 */
 	public function iHaveArticleWithName($title)
 	{
 		$I = $this;
-		$I->amOnPage(ArticleManagerPage::$pageURL);
+		$I->amOnPage(ArticleManagerPage::$url);
 		$I->fillField(ArticleManagerPage::$filterSearch, $title);
 		$I->click(ArticleManagerPage::$iconSearch);
 		$I->checkAllResults();
@@ -145,7 +135,7 @@ public function iSeeArticleUnpublishMessage($title, $message)
 	public function iHaveContentArticleWhichNeedsToBeTrash($title)
 	{
 		$I = $this;
-		$I->amOnPage(ArticleManagerPage::$pageURL);
+		$I->amOnPage(ArticleManagerPage::$url);
 		$I->fillField(ArticleManagerPage::$filterSearch, $title);
 		$I->click(ArticleManagerPage::$iconSearch);
 		$I->checkAllResults();
@@ -169,4 +159,4 @@ public function iSeeArticleTrashMessage($title, $message)
 		$I->waitForPageTitle($title);
 		$I->see($message, AdminPage::$systemMessageContainer);
 	}
-}
+}