joomla/weblinks
32
1
Fork 0
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-12-27 18:24:56 +00:00
Code Issues Releases Activity

Merge

Browse Source
This commit is contained in:
Yves Hoppe 2015-11-01 10:22:31 +01:00
parent dc67401e70
commit 3683dfb0a7
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/acceptance/install/InstallWeblinksCest.php
View File

@ -26,15 +26,10 @@ class InstallWeblinksCest
{ {
$I->doAdministratorLogin(); $I->doAdministratorLogin();
$I->comment('get Weblinks repository folder from acceptance.suite.yml (see _support/AcceptanceHelper.php)'); $I->comment('get Weblinks repository folder from acceptance.suite.yml (see _support/AcceptanceHelper.php)');
<<<<<<< HEAD
// URL where the package file to install is located (mostly the same as joomla-cms) // URL where the package file to install is located (mostly the same as joomla-cms)
$url = $I->getConfiguration('url'); $url = $I->getConfiguration('url');
$I->installExtensionFromUrl($url . "/pkg-weblinks-current.zip"); $I->installExtensionFromUrl($url . "/pkg-weblinks-current.zip");
=======
$path = $I->getConfiguration('repo_folder');
$I->installExtensionFromFolder(rtrim($path, "/") . '/src/com_weblinks/');
>>>>>>> master
$I->doAdministratorLogout(); $I->doAdministratorLogout();
} }
} }