Merge pull request #3 from javigomez/updatedJM

Updated to new JoRobo requirements and add a acceptPopup to weblinks removal

.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"
     }
 }

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a8a7b0841ddc3e3a0bd3342685dec2c7",
-    "content-hash": "6960f421ca42c77ad244335fb8fb3ee3",
+    "hash": "1e02f52490bd8e653a61756e42ffdf13",
+    "content-hash": "485d45ee16fd095375863f13246c60d3",
     "packages": [],
     "packages-dev": [
         {
@@ -705,7 +705,7 @@
         },
         {
             "name": "joomla-projects/jorobo",
-            "version": "dev-master",
+            "version": "0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-projects/jorobo.git",
@@ -3222,8 +3222,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "joomla-projects/joomla-browser": 20,
-        "joomla-projects/robo": 20,
-        "joomla-projects/jorobo": 20
+        "joomla-projects/robo": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

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']);