From 149df2d7b674e601f8f1197fe705a2a23d2a4229 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Nov 2019 13:03:50 +0100 Subject: [ticket/12574] Adjust login tests for ldap PHPBB3-12574 --- tests/auth/fixtures/user.xml | 12 ++++ tests/auth/provider_ldap_test.php | 134 ++++---------------------------------- 2 files changed, 26 insertions(+), 120 deletions(-) (limited to 'tests') diff --git a/tests/auth/fixtures/user.xml b/tests/auth/fixtures/user.xml index 1e0eb6ee49..33f69a9067 100644 --- a/tests/auth/fixtures/user.xml +++ b/tests/auth/fixtures/user.xml @@ -1,5 +1,17 @@ + + group_id + group_name + group_type + group_desc + + 1 + REGISTERED + 3 + foobar + +
user_idusername diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php index 5482f964bf..7d95f476bc 100644 --- a/tests/auth/provider_ldap_test.php +++ b/tests/auth/provider_ldap_test.php @@ -55,36 +55,23 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case { $this->assertFalse($this->provider->init()); } -/* + public function test_login() { - $username = 'foobar'; - $password = 'example'; - - $this->request->expects($this->once()) - ->method('is_set') - ->with('PHP_AUTH_USER', - \phpbb\request\request_interface::SERVER) - ->will($this->returnValue(true)); - $this->request->expects($this->at(1)) - ->method('server') - ->with('PHP_AUTH_USER') - ->will($this->returnValue('foobar')); - $this->request->expects($this->at(2)) - ->method('server') - ->with('PHP_AUTH_PW') - ->will($this->returnValue('example')); + $username = 'admin'; + $password = 'adminadmin'; $expected = array( - 'status' => LOGIN_SUCCESS, + 'status' => LOGIN_SUCCESS_CREATE_PROFILE, // successful login and user created 'error_msg' => false, 'user_row' => array( - 'user_id' => '1', - 'username' => 'foobar', - 'user_password' => $this->password_hash, - 'user_passchg' => '0', - 'user_email' => 'example@example.com', - 'user_type' => '0', + 'username' => 'admin', + 'user_password' => '', + 'user_email' => 'admin@example.com', + 'user_type' => 0, + 'group_id' => 1, + 'user_new' => 0, + 'user_ip' => '', ), ); @@ -93,109 +80,16 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case public function test_autologin() { - $this->request->expects($this->once()) - ->method('is_set') - ->with('PHP_AUTH_USER', - \phpbb\request\request_interface::SERVER) - ->will($this->returnValue(true)); - $this->request->expects($this->at(1)) - ->method('server') - ->with('PHP_AUTH_USER') - ->will($this->returnValue('foobar')); - $this->request->expects($this->at(2)) - ->method('server') - ->with('PHP_AUTH_PW') - ->will($this->returnValue('example')); - - $expected = array( - 'user_id' => '1', - 'user_type' => '0', - 'group_id' => '3', - 'user_permissions' => '', - 'user_perm_from' => '0', - 'user_ip' => '', - 'user_regdate' => '0', - 'username' => 'foobar', - 'username_clean' => 'foobar', - 'user_password' => $this->password_hash, - 'user_passchg' => '0', - 'user_email' => 'example@example.com', - 'user_email_hash' => '0', - 'user_birthday' => '', - 'user_lastvisit' => '0', - 'user_lastmark' => '0', - 'user_lastpost_time' => '0', - 'user_lastpage' => '', - 'user_last_confirm_key' => '', - 'user_last_search' => '0', - 'user_warnings' => '0', - 'user_last_warning' => '0', - 'user_login_attempts' => '0', - 'user_inactive_reason' => '0', - 'user_inactive_time' => '0', - 'user_posts' => '0', - 'user_lang' => '', - 'user_timezone' => '', - 'user_dateformat' => 'd M Y H:i', - 'user_style' => '0', - 'user_rank' => '0', - 'user_colour' => '', - 'user_new_privmsg' => '0', - 'user_unread_privmsg' => '0', - 'user_last_privmsg' => '0', - 'user_message_rules' => '0', - 'user_full_folder' => '-3', - 'user_emailtime' => '0', - 'user_topic_show_days' => '0', - 'user_topic_sortby_type' => 't', - 'user_topic_sortby_dir' => 'd', - 'user_post_show_days' => '0', - 'user_post_sortby_type' => 't', - 'user_post_sortby_dir' => 'a', - 'user_notify' => '0', - 'user_notify_pm' => '1', - 'user_notify_type' => '0', - 'user_allow_pm' => '1', - 'user_allow_viewonline' => '1', - 'user_allow_viewemail' => '1', - 'user_allow_massemail' => '1', - 'user_options' => '230271', - 'user_avatar' => '', - 'user_avatar_type' => '', - 'user_avatar_width' => '0', - 'user_avatar_height' => '0', - 'user_sig' => '', - 'user_sig_bbcode_uid' => '', - 'user_sig_bbcode_bitfield' => '', - 'user_jabber' => '', - 'user_actkey' => '', - 'user_newpasswd' => '', - 'user_form_salt' => '', - 'user_new' => '1', - 'user_reminded' => '0', - 'user_reminded_time' => '0', - ); - - $this->assertEquals($expected, $this->provider->autologin()); + $this->assertNull($this->provider->autologin()); } public function test_validate_session() { $user = array( - 'username' => 'foobar', + 'username' => 'admin', 'user_type' ); - $this->request->expects($this->once()) - ->method('is_set') - ->with('PHP_AUTH_USER', - \phpbb\request\request_interface::SERVER) - ->will($this->returnValue(true)); - $this->request->expects($this->once()) - ->method('server') - ->with('PHP_AUTH_USER') - ->will($this->returnValue('foobar')); - $this->assertTrue($this->provider->validate_session($user)); + $this->assertNull($this->provider->validate_session($user)); } -*/ } -- cgit v1.2.1