Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed login and register phpunit tests #1760

Merged
merged 1 commit into from
Jun 6, 2017
Merged

Fixed login and register phpunit tests #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions includes/login-register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@
*/
function give_login_form( $login_redirect = '', $logout_redirect = '' ) {
if ( empty( $login_redirect ) ) {
$login_redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
$login_redirect = add_query_arg( 'give-login-success', 'true', give_get_current_page_url() );
}

if ( empty( $logout_redirect ) ) {
$logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
}


// Add user_logout action to logout url.
$logout_redirect = add_query_arg(
array(
Expand All @@ -52,7 +51,7 @@ function give_login_form( $login_redirect = '', $logout_redirect = '' ) {
'shortcode-login',
array(
'give_login_redirect' => $login_redirect,
'give_logout_redirect' => $logout_redirect
'give_logout_redirect' => $logout_redirect,
)
);

Expand Down Expand Up @@ -80,7 +79,7 @@ function give_register_form( $redirect = '' ) {
give_get_template(
'shortcode-register',
array(
'give_register_redirect' => $redirect
'give_register_redirect' => $redirect,
)
);
}
Expand All @@ -106,13 +105,13 @@ function give_process_login_form( $data ) {
if ( $user_data ) {
$user_ID = $user_data->ID;
$user_email = $user_data->user_email;
if ( wp_check_password( $data['give_user_pass'], $user_data->user_pass, $user_data->ID ) ) {
if ( wp_check_password( $data['give_user_pass'], $user_data->user_pass, $user_ID ) ) {
give_log_user_in( $user_data->ID, $data['give_user_login'], $data['give_user_pass'] );
} else {
give_set_error( 'password_incorrect', esc_html__( 'The password you entered is incorrect.', 'give' ) );
give_set_error( 'password_incorrect', __( 'The password you entered is incorrect.', 'give' ) );
}
} else {
give_set_error( 'username_incorrect', esc_html__( 'The username you entered does not exist.', 'give' ) );
give_set_error( 'username_incorrect', __( 'The username you entered does not exist.', 'give' ) );
}
// Check for errors and redirect if none present
$errors = give_get_errors();
Expand All @@ -137,31 +136,31 @@ function give_process_login_form( $data ) {
* @return void
*/
function give_process_user_logout( $data ) {
if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {

// Prevent occurring of any custom action on wp_logout.
remove_all_actions( 'wp_logout' );
// Prevent occurring of any custom action on wp_logout.
remove_all_actions( 'wp_logout' );

/**
* Fires before processing user logout.
*
* @since 1.0
*/
do_action( 'give_before_user_logout' );
do_action( 'give_before_user_logout' );

// Logout user.
wp_logout();
// Logout user.
wp_logout();

/**
* Fires after processing user logout.
*
* @since 1.0
*/
do_action( 'give_after_user_logout' );
do_action( 'give_after_user_logout' );

wp_redirect( $data['give_logout_redirect'] );
give_die();
}
wp_redirect( $data['give_logout_redirect'] );
give_die();
}
}

add_action( 'give_user_logout', 'give_process_user_logout' );
Expand All @@ -175,11 +174,12 @@ function give_process_user_logout( $data ) {
* @param string $user_login Username
* @param string $user_pass Password
*
* @return void
* @return bool
*/
function give_log_user_in( $user_id, $user_login, $user_pass ) {

if ( $user_id < 1 ) {
return;
return false;
}

wp_set_auth_cookie( $user_id );
Expand Down Expand Up @@ -215,16 +215,16 @@ function give_log_user_in( $user_id, $user_login, $user_pass ) {
*
* @param array $data Data sent from the register form
*
* @return void
* @return bool
*/
function give_process_register_form( $data ) {

if ( is_user_logged_in() ) {
return;
return false;
}

if ( empty( $_POST['give_register_submit'] ) ) {
return;
return false;
}

/**
Expand Down Expand Up @@ -285,12 +285,12 @@ function give_process_register_form( $data ) {
'user_pass' => $data['give_user_pass'],
'user_email' => $data['give_user_email'],
'user_registered' => date( 'Y-m-d H:i:s' ),
'role' => get_option( 'default_role' )
'role' => get_option( 'default_role' ),
) );

wp_redirect( $redirect );
give_die();
}
}

add_action( 'give_user_register', 'give_process_register_form' );
add_action( 'give_user_register', 'give_process_register_form' );
98 changes: 55 additions & 43 deletions tests/unit-tests/tests-login-register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,22 @@
* @group give_login_register
*/
class Tests_Login_Register extends Give_Unit_Test_Case {

public function setUp() {

parent::setUp();
wp_set_current_user(0);

// Prevent give_die() from stopping tests.
if ( ! defined( 'GIVE_UNIT_TESTS' ) ) {
define( 'GIVE_UNIT_TESTS', true );
}

// Set the current user.
wp_set_current_user( 0 );

}


/**
* Test that the login form shortcode returns the expected string.
*/
Expand Down Expand Up @@ -71,19 +82,24 @@ public function test_process_login_form_correct_username_invalid_pass() {
* @since 1.3.2
*/
public function test_process_login_form_correct_login() {
$this->markTestIncomplete( 'Causes headers already sent errors');
/*

// Prevent wp_redirect from sending headers.
add_filter( 'give_login_redirect', '__return_false' );

ob_start();
give_process_login_form( array(
'give_login_nonce' => wp_create_nonce( 'give-login-nonce' ),
'give_user_login' => 'admin@example.org',
'give_user_pass' => 'password',
) );
$return = ob_get_contents();

give_process_login_form( array(
'give_login_nonce' => wp_create_nonce( 'give-login-nonce' ),
'give_user_login' => 'admin@example.org',
'give_user_pass' => 'password',
'give_login_redirect' => 'https://examplesite.org/',
) );

ob_get_contents();
ob_end_clean();

$this->assertEmpty( give_get_errors() );
*/

}

/**
Expand All @@ -92,7 +108,7 @@ public function test_process_login_form_correct_login() {
* @since 1.3.2
*/
public function test_log_user_in_return() {
$this->assertNull( give_log_user_in( 0, '', '' ) );
$this->assertFalse( give_log_user_in( 0, '', '' ) );
}

/**
Expand All @@ -101,12 +117,10 @@ public function test_log_user_in_return() {
* @since 1.3.2
*/
public function test_log_user_in() {
$this->markTestIncomplete( 'Causes headers already sent errors');
/*
wp_logout();
give_log_user_in( 1 );
$user = new WP_User( 1 );
give_log_user_in( $user->ID, $user->user_email, $user->user_pass );
$this->assertTrue( is_user_logged_in() );
*/
}

/**
Expand All @@ -120,7 +134,7 @@ public function test_process_register_form_logged_in() {
$current_user = wp_set_current_user( 1 );

$_POST['give_register_submit'] = '';
$this->assertNull( give_process_register_form( array() ) );
$this->assertFalse( give_process_register_form( array( 'give_redirect' => '', ) ) );

// Reset to origin
$current_user = $origin_user;
Expand All @@ -135,7 +149,7 @@ public function test_process_register_form_logged_in() {
public function test_process_register_form_return_submit() {

$_POST['give_register_submit'] = '';
$this->assertNull( give_process_register_form( array(
$this->assertFalse( give_process_register_form( array(
'give_register_submit' => '',
) ) );

Expand Down Expand Up @@ -199,13 +213,13 @@ public function test_process_register_form_username_exists() {
*/
public function test_process_register_form_username_invalid() {

$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = 'password';
$_POST['give_user_pass2'] = 'other-password';
$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = 'password';
$_POST['give_user_pass2'] = 'other-password';
give_process_register_form( array(
'give_register_submit' => 1,
'give_user_login' => 'admin#!@*&',
'give_user_email' => null,
'give_register_submit' => 1,
'give_user_login' => 'admin#!@*&',
'give_user_email' => null,
) );
$this->assertArrayHasKey( 'username_invalid', give_get_errors() );

Expand All @@ -221,14 +235,14 @@ public function test_process_register_form_username_invalid() {
*/
public function test_process_register_form_payment_email_incorrect() {

$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = '';
$_POST['give_user_pass2'] = '';
$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = '';
$_POST['give_user_pass2'] = '';
give_process_register_form( array(
'give_register_submit' => 1,
'give_user_login' => 'random_username',
'give_user_email' => 'admin@example.org',
'give_payment_email' => 'someotheradminexample.org',
'give_register_submit' => 1,
'give_user_login' => 'random_username',
'give_user_email' => 'admin@example.org',
'give_payment_email' => 'someotheradminexample.org',
) );
$this->assertArrayHasKey( 'email_unavailable', give_get_errors() );
$this->assertArrayHasKey( 'payment_email_invalid', give_get_errors() );
Expand All @@ -243,23 +257,21 @@ public function test_process_register_form_payment_email_incorrect() {
* @since 1.3.2
*/
public function test_process_register_form_success() {
$this->markTestIncomplete( 'Causes headers already sent errors');
/*
$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = 'password';
$_POST['give_user_pass2'] = 'password';

$_POST['give_register_submit'] = 1;
$_POST['give_user_pass'] = 'password';
$_POST['give_user_pass2'] = 'password';
give_process_register_form( array(
'give_register_submit' => 1,
'give_user_login' => 'random_username',
'give_user_email' => 'random_username@example.org',
'give_payment_email' => 'random_username@example.org',
'give_user_pass' => 'password',
'give_redirect' => '/',
'give_register_submit' => 1,
'give_user_login' => 'random_username',
'give_user_email' => 'random_username@example.org',
'give_payment_email' => 'random_username@example.org',
'give_user_pass' => 'password',
'give_redirect' => '',
) );

// Clear errors for other test
// Clear errors for other test.
give_clear_errors();
*/
}

}