Merge branch 'master' into pr/185

.gitignore

@@ -60,5 +60,5 @@ tests/cache
 
 # Package building related
 /dist
-jbuild.ini
+jorobo.ini
 

.travis.yml

@@ -37,7 +37,7 @@ before_script:
 
 script:
 # Build
-- mv jbuild.dist.ini jbuild.ini
+- mv jorobo.dist.ini jorobo.ini
 - vendor/bin/robo build
 - mv tests/acceptance.suite.dist.yml tests/acceptance.suite.yml
 - vendor/bin/robo run:tests --use-htaccess

RoboFile.php

@@ -484,9 +484,9 @@ class RoboFile extends \Robo\Tasks
 	 */
 	public function build($params = ['dev' => false])
 	{
-		if (!file_exists('jbuild.ini'))
+		if (!file_exists('jorobo.ini'))
 		{
-			$this->_copy('jbuild.dist.ini', 'jbuild.ini');
+			$this->_copy('jorobo.dist.ini', 'jorobo.ini');
 		}
 
 		$this->taskBuild($params)->run();

composer.json

@@ -12,6 +12,6 @@
         "joomla-projects/robo": "dev-master",
         "joomla-projects/selenium-server-standalone": "v2.47.1",
         "fzaninotto/faker": "^1.5",
-        "joomla-projects/jorobo": "dev-master"
+        "joomla-projects/jorobo": "0.2"
     }
 }

src/administrator/components/com_weblinks/views/weblinks/view.html.php

@@ -86,7 +86,7 @@ class WeblinksViewWeblinks extends JViewLegacy
 
 		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
 		{
-			JToolbarHelper::deleteList('', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH');
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'weblinks.delete', 'JTOOLBAR_EMPTY_TRASH');
 		}
 		elseif ($canDo->get('core.edit.state'))
 		{

tests/acceptance/administrator/AdministratorCategoriesCest.php

@@ -168,6 +168,7 @@ class AdministratorCategoriesCest
 		$I->checkAllResults();
 		$I->amGoingTo('try to delete a Weblinks Category');
 		$I->clickToolbarButton('Empty trash');
+		$I->acceptPopup();
 		$I->waitForElement(['id' => 'system-message-container'], '60');
 		$I->expectTo('see a success message after Deleting the category');
 		$I->see('1 category successfully deleted.', ['id' => 'system-message-container']);

tests/acceptance/administrator/AdministratorWeblinksCest.php

@@ -107,6 +107,7 @@ class AdministratorWeblinksCest
 		$I->amGoingTo('Delete the just saved weblink');
 		$I->checkAllResults();
 		$I->click(['xpath'=> '//div[@id="toolbar-delete"]/button']);
+		$I->acceptPopup();
 		$I->waitForText('Web Links','30',['css' => 'h1']);
 		$I->expectTo('see a success message and the weblink removed from the list');
 		$I->see('1 web link successfully deleted.',['id' => 'system-message-container']);