joomla/weblinks
30
1
Fork 0
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-05-29 04:30:46 +00:00
Code Issues Releases Activity

Merge branch 'master' into pr/185

Browse Source
This commit is contained in:
javier gomez 2016-02-03 13:29:00 +01:00
commit 7bfa0200f1
9 changed files with 329 additions and 848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
.travis.yml
View File

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

4
RoboFile.php
View File

@ -484,9 +484,9 @@ class RoboFile extends \Robo\Tasks
*/ */
public function build($params = ['dev' => false]) 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(); $this->taskBuild($params)->run();

2
composer.json
View File

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

1163
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

0
jbuild.dist.ini → jorobo.dist.ini
View File

2
src/administrator/components/com_weblinks/views/weblinks/view.html.php
View File

@ -86,7 +86,7 @@ class WeblinksViewWeblinks extends JViewLegacy
if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) 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')) elseif ($canDo->get('core.edit.state'))
{ {

1
tests/acceptance/administrator/AdministratorCategoriesCest.php
View File

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

1
tests/acceptance/administrator/AdministratorWeblinksCest.php
View File

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