diff --git a/auth/tests/auth_test.php b/auth/tests/auth_test.php deleted file mode 100644 index 914c05f66c3..00000000000 --- a/auth/tests/auth_test.php +++ /dev/null @@ -1,79 +0,0 @@ -. - -/** - * Tests for auth. - * - * @package core_auth - * @copyright 2013 Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->libdir . '/authlib.php'); - -/** - * Auth testcase class. - * - * @package core_auth - * @copyright 2013 Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class core_auth_testcase extends advanced_testcase { - - public function test_user_loggedin_event() { - global $USER; - $this->resetAfterTest(true); - $this->setAdminUser(); - - $sink = $this->redirectEvents(); - $user = clone($USER); - login_attempt_valid($user); - $events = $sink->get_events(); - $sink->close(); - - $this->assertCount(1, $events); - $event = reset($events); - $this->assertInstanceOf('\core_auth\event\user_loggedin', $event); - $this->assertEquals('user', $event->objecttable); - $this->assertEquals('2', $event->objectid); - $this->assertEquals(context_system::instance()->id, $event->contextid); - $this->assertEquals($user, $event->get_record_snapshot('user', 2)); - - $this->assertEventLegacyData(null, $event); - $expectedlog = array(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID, $user->id, 0, $user->id); - $this->assertEventLegacyLogData($expectedlog, $event); - } - - public function test_user_loggedin_event_exceptions() { - try { - $event = \core_auth\event\user_loggedin::create(array('objectid' => 1)); - $this->fail('\core_auth\event\user_loggedin requires other[\'username\']'); - } catch(Exception $e) { - $this->assertInstanceOf('coding_exception', $e); - } - - try { - $event = \core_auth\event\user_loggedin::create(array('other' => array('username' => 'test'))); - $this->fail('\core_auth\event\user_loggedin requires objectid'); - } catch(Exception $e) { - $this->assertInstanceOf('coding_exception', $e); - } - } - -} diff --git a/lib/authlib.php b/lib/authlib.php index dc5e97e195d..c24c5be9bc3 100644 --- a/lib/authlib.php +++ b/lib/authlib.php @@ -618,8 +618,7 @@ function login_is_lockedout($user) { function login_attempt_valid($user) { global $CFG; - $event = \core_auth\event\user_loggedin::create(array('objectid' => $user->id, - 'other' => array('username' => $user->username))); + $event = \core\event\user_loggedin::create(array('objectid' => $user->id, 'other' => array('username' => $user->username))); $event->add_record_snapshot('user', $user); $event->trigger(); diff --git a/auth/classes/event/user_loggedin.php b/lib/classes/event/user_loggedin.php similarity index 96% rename from auth/classes/event/user_loggedin.php rename to lib/classes/event/user_loggedin.php index 74279756a17..dd5a3227422 100644 --- a/auth/classes/event/user_loggedin.php +++ b/lib/classes/event/user_loggedin.php @@ -17,19 +17,19 @@ /** * User login event. * - * @package core_auth + * @package core * @copyright 2013 Frédéric Massart * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_auth\event; +namespace core\event; defined('MOODLE_INTERNAL') || die(); /** * User login event class. * - * @package core_auth + * @package core * @copyright 2013 Frédéric Massart * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -64,7 +64,7 @@ class user_loggedin extends \core\event\base { } /** - * Get URL related to the action + * Get URL related to the action. * * @return \moodle_url */ diff --git a/lib/tests/authlib_test.php b/lib/tests/authlib_test.php index 6d929c062e2..851b14106d3 100644 --- a/lib/tests/authlib_test.php +++ b/lib/tests/authlib_test.php @@ -184,4 +184,41 @@ class core_authlib_testcase extends advanced_testcase { ini_set('error_log', $oldlog); } + + public function test_user_loggedin_event() { + global $USER; + $this->resetAfterTest(true); + $this->setAdminUser(); + + $sink = $this->redirectEvents(); + $user = clone($USER); + login_attempt_valid($user); + $events = $sink->get_events(); + $sink->close(); + + $this->assertCount(1, $events); + $event = reset($events); + $this->assertInstanceOf('\core\event\user_loggedin', $event); + $this->assertEquals('user', $event->objecttable); + $this->assertEquals('2', $event->objectid); + $this->assertEquals(context_system::instance()->id, $event->contextid); + $this->assertEquals($user, $event->get_record_snapshot('user', 2)); + } + + public function test_user_loggedin_event_exceptions() { + try { + $event = \core\event\user_loggedin::create(array('objectid' => 1)); + $this->fail('\core\event\user_loggedin requires other[\'username\']'); + } catch(Exception $e) { + $this->assertInstanceOf('coding_exception', $e); + } + + try { + $event = \core\event\user_loggedin::create(array('other' => array('username' => 'test'))); + $this->fail('\core\event\user_loggedin requires objectid'); + } catch(Exception $e) { + $this->assertInstanceOf('coding_exception', $e); + } + } + } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 4932dda34cc..7ee2c3896b5 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -58,9 +58,6 @@ grade/tests grade/grading/tests - - auth/tests - backup/controller/tests backup/converter/moodle1/tests