Skip to content
Snippets Groups Projects
Commit 786d172c authored by Demian Katz's avatar Demian Katz
Browse files

More test refactoring.

parent cfe62d95
No related merge requests found
Hide whitespace changes
Inline Side-by-side
module/VuFind/src/VuFindTest/Unit/UserCreationTrait.php
+ 53
− 1
View file @ 786d172c
......@@ -65,6 +65,21 @@ trait UserCreationTrait
}
}
/**
* Mink support function: assert a warning message in the lightbox.
*
* @param Element $page Page element
* @param string $message Expected message
*
* @return void
*/
protected function assertLightboxWarning(Element $page, $message)
{
$warning = $page->find('css', '.modal-body .alert-danger .message');
$this->assertTrue(is_object($warning));
$this->assertEquals($message, $warning->getText());
}
/**
* Mink support function: fill in the account creation form.
*
......@@ -93,6 +108,43 @@ trait UserCreationTrait
}
}
/**
* Mink support function: fill in the login form.
*
* @param Element $page Page element.
* @param string $username Username to set (null to skip)
* @param string $password Password to set (null to skip)
*
* @return void
*/
protected function fillInLoginForm(Element $page, $username, $password)
{
if (null !== $username) {
$usernameField = $page->find('css', '.modal-body [name="username"]');
$this->assertNotNull($usernameField);
$usernameField->setValue($username);
}
if (null !== $password) {
$passwordField = $page->find('css', '.modal-body [name="password"]');
$this->assertNotNull($passwordField);
$passwordField->setValue($password);
}
}
/**
* Submit the login form (assuming it's open).
*
* @param Element $page Page element.
*
* @return void
*/
protected function submitLoginForm(Element $page)
{
$button = $page->find('css', '.modal-body .btn.btn-primary');
$this->assertNotNull($button);
$button->click();
}
/**
* Static teardown support function to destroy user accounts. Accounts are
* expected to exist, and the method will fail if they are missing.
......@@ -116,7 +168,7 @@ trait UserCreationTrait
foreach ((array)$users as $username) {
$user = $userTable->getByUsername($username, false);
if (empty($user)) {
throw new \Exception("Problem deleting expected user ($user).");
throw new \Exception("Problem deleting expected user ($username).");
}
$user->delete();
}
......
module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
+ 15
− 27
View file @ 786d172c
......@@ -142,22 +142,17 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
$page = $this->gotoRecord($session);
$page->findById('save-record')->click();
$username = '.modal-body [name="username"]';
$password = '.modal-body [name="password"]';
$this->assertNotNull($page->find('css', $username));
$this->assertNotNull($page->find('css', $password));
// Login
// - empty
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->assertNotNull($page->find('css', $username));
$this->submitLoginForm($page);
$this->assertLightboxWarning($page, 'Login information cannot be blank.');
// - wrong
$page->find('css', $username)->setValue('username1');
$page->find('css', $password)->setValue('superwrong');
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->assertNotNull($page->find('css', $username));
$this->fillInLoginForm($page, 'username1', 'superwrong');
$this->submitLoginForm($page);
$this->assertLightboxWarning($page, 'Invalid login -- please try again.');
// - for real
$page->find('css', $password)->setValue('test');
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->fillInLoginForm($page, null, 'test');
$this->submitLoginForm($page);
// Make sure we don't have Favorites because we have another populated list
$this->assertNull($page->find('css', '.modal-body #save_list'));
// Make Two Lists
......@@ -194,9 +189,8 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
$page = $this->gotoRecord($session);
// Login
$page->find('css', '#loginOptions a')->click();
$page->find('css', '.modal-body [name="username"]')->setValue('username1');
$page->find('css', '.modal-body [name="password"]')->setValue('test');
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->fillInLoginForm($page, 'username1', 'test');
$this->submitLoginForm($page);
$session->reload();
// Save Record
$page->findById('save-record')->click();
......@@ -278,18 +272,13 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
$page = $this->gotoSearch($session);
$page->find('css', '.save-record')->click();
$username = '.modal-body [name="username"]';
$password = '.modal-body [name="password"]';
$this->assertNotNull($page->find('css', $username));
$this->assertNotNull($page->find('css', $password));
// Login
// - empty
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->assertNotNull($page->find('css', $username));
$this->submitLoginForm($page);
$this->assertLightboxWarning($page, 'Login information cannot be blank.');
// - for real
$page->find('css', $username)->setValue('username2');
$page->find('css', $password)->setValue('test');
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->fillInLoginForm($page, 'username2', 'test');
$this->submitLoginForm($page);
// Make sure we don't have Favorites because we have another populated list
$this->assertNull($page->find('css', '.modal-body #save_list'));
// Make Two Lists
......@@ -326,9 +315,8 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
$page = $this->gotoSearch($session);
// Login
$page->find('css', '#loginOptions a')->click();
$page->find('css', '.modal-body [name="username"]')->setValue('username2');
$page->find('css', '.modal-body [name="password"]')->setValue('test');
$page->find('css', '.modal-body .btn.btn-primary')->click();
$this->fillInLoginForm($page, 'username2', 'test');
$this->submitLoginForm($page);
$session->reload();
// Save Record
$page->find('css', '.save-record')->click();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment