Started work on user profile pages

This commit is contained in:
Dan Brown
2016-02-16 21:25:11 +00:00
parent 293be7093c
commit 4442a2e6d1
30 changed files with 291 additions and 156 deletions

View File

@ -129,7 +129,7 @@ class AuthTest extends TestCase
$user = factory(\BookStack\User::class)->make();
$this->asAdmin()
->visit('/users')
->visit('/settings/users')
->click('Add new user')
->type($user->name, '#name')
->type($user->email, '#email')
@ -138,7 +138,7 @@ class AuthTest extends TestCase
->type($user->password, '#password-confirm')
->press('Save')
->seeInDatabase('users', $user->toArray())
->seePageIs('/users')
->seePageIs('/settings/users')
->see($user->name);
}
@ -147,13 +147,13 @@ class AuthTest extends TestCase
$user = \BookStack\User::all()->last();
$password = $user->password;
$this->asAdmin()
->visit('/users')
->visit('/settings/users')
->click($user->name)
->seePageIs('/users/' . $user->id)
->seePageIs('/settings/users/' . $user->id)
->see($user->email)
->type('Barry Scott', '#name')
->press('Save')
->seePageIs('/users')
->seePageIs('/settings/users')
->seeInDatabase('users', ['id' => $user->id, 'name' => 'Barry Scott', 'password' => $password])
->notSeeInDatabase('users', ['name' => $user->name]);
}
@ -161,7 +161,7 @@ class AuthTest extends TestCase
public function test_user_password_update()
{
$user = \BookStack\User::all()->last();
$userProfilePage = '/users/' . $user->id;
$userProfilePage = '/settings/users/' . $user->id;
$this->asAdmin()
->visit($userProfilePage)
->type('newpassword', '#password')
@ -172,7 +172,7 @@ class AuthTest extends TestCase
->type('newpassword', '#password')
->type('newpassword', '#password-confirm')
->press('Save')
->seePageIs('/users');
->seePageIs('/settings/users');
$userPassword = \BookStack\User::find($user->id)->password;
$this->assertTrue(Hash::check('newpassword', $userPassword));
@ -184,11 +184,11 @@ class AuthTest extends TestCase
$user = $this->getNewUser($userDetails->toArray());
$this->asAdmin()
->visit('/users/' . $user->id)
->visit('/settings/users/' . $user->id)
->click('Delete User')
->see($user->name)
->press('Confirm')
->seePageIs('/users')
->seePageIs('/settings/users')
->notSeeInDatabase('users', ['name' => $user->name]);
}
@ -199,10 +199,10 @@ class AuthTest extends TestCase
$this->assertEquals(1, $adminRole->users()->count());
$user = $adminRole->users->first();
$this->asAdmin()->visit('/users/' . $user->id)
$this->asAdmin()->visit('/settings/users/' . $user->id)
->click('Delete User')
->press('Confirm')
->seePageIs('/users/' . $user->id)
->seePageIs('/settings/users/' . $user->id)
->see('You cannot delete the only admin');
}

View File

@ -94,7 +94,7 @@ class LdapTest extends \TestCase
public function test_create_user_form()
{
$this->asAdmin()->visit('/users/create')
$this->asAdmin()->visit('/settings/users/create')
->dontSee('Password')
->type($this->mockUser->name, '#name')
->type($this->mockUser->email, '#email')
@ -102,19 +102,19 @@ class LdapTest extends \TestCase
->see('The external auth id field is required.')
->type($this->mockUser->name, '#external_auth_id')
->press('Save')
->seePageIs('/users')
->seePageIs('/settings/users')
->seeInDatabase('users', ['email' => $this->mockUser->email, 'external_auth_id' => $this->mockUser->name, 'email_confirmed' => true]);
}
public function test_user_edit_form()
{
$editUser = User::all()->last();
$this->asAdmin()->visit('/users/' . $editUser->id)
$this->asAdmin()->visit('/settings/users/' . $editUser->id)
->see('Edit User')
->dontSee('Password')
->type('test_auth_id', '#external_auth_id')
->press('Save')
->seePageIs('/users')
->seePageIs('/settings/users')
->seeInDatabase('users', ['email' => $editUser->email, 'external_auth_id' => 'test_auth_id']);
}
@ -127,7 +127,7 @@ class LdapTest extends \TestCase
public function test_non_admins_cannot_change_auth_id()
{
$testUser = User::all()->last();
$this->actingAs($testUser)->visit('/users/' . $testUser->id)
$this->actingAs($testUser)->visit('/settings/users/' . $testUser->id)
->dontSee('External Authentication');
}