Skip to content

Commit

Permalink
fix(Tinebase/User): make account blocking work again
Browse files Browse the repository at this point in the history
  • Loading branch information
pschuele committed Sep 17, 2024
1 parent 4704af3 commit 4d99a24
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 0 additions & 2 deletions tests/tine20/Tinebase/ControllerServerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ public function testInvalidLogin()
*/
public function testAccountBlocking()
{
self::markTestSkipped('FIXME account should be blocked? or test can be removed');

// NOTE: end transaction here as NOW() returns the start of the current transaction in pgsql
// and is used in user status statement (think about using statement_timestamp() instead of NOW() with pgsql)
Tinebase_TransactionManager::getInstance()->commitTransaction($this->_transactionId);
Expand Down
3 changes: 1 addition & 2 deletions tests/tine20/Tinebase/User/SqlTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,10 @@ public function testSetStatusEnabled()

/**
* try to enable an account
*
*/
public function testUserIsBlocked()
{
self::markTestSkipped('FIXME account should be blocked? or test can be removed');

// add a test user (enabled by default)
$testUser = $this->testAddUser();

Expand Down
6 changes: 3 additions & 3 deletions tine20/Tinebase/Setup/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
</table>
<table>
<name>accounts</name>
<version>19</version>
<version>20</version>
<declaration>
<field>
<name>id</name>
Expand Down Expand Up @@ -313,8 +313,8 @@
</field>
<field>
<name>login_failures</name>
<type>integer</type>
<default>0</default>
<type>text</type>
<length>4000</length>
</field>
<field>
<name>last_login_failure_at</name>
Expand Down

0 comments on commit 4d99a24

Please sign in to comment.