]>
BookStack Code Mirror - bookstack/commitdiff
projects
/
bookstack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
684c20c
)
Trying to make the tests green.
author
Clément Blanco
<redacted>
Mon, 17 Jul 2017 13:18:03 +0000
(14:18 +0100)
committer
Clément Blanco
<redacted>
Mon, 17 Jul 2017 13:18:03 +0000
(14:18 +0100)
.travis.yml
patch
|
blob
|
history
tests/Auth/LdapTest.php
patch
|
blob
|
history
diff --git
a/.travis.yml
b/.travis.yml
index 4613c64ef0d0457f5be14762d7347358674121a1..f03865201492e3657b2d8b7b59023f090dc6af7a 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-12,7
+12,6
@@
addons:
before_install:
- echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - php -i "(command-line 'phpinfo()')" | grep ldap
cache:
directories:
diff --git
a/tests/Auth/LdapTest.php
b/tests/Auth/LdapTest.php
index 681ead91c7e7bffda43284200b00e90bf32a8c9a..f66d357e3c1008c5556a763a674003002f668a87 100644
(file)
--- a/
tests/Auth/LdapTest.php
+++ b/
tests/Auth/LdapTest.php
@@
-21,6
+21,7
@@
class LdapTest extends BrowserKitTest
{
$this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
$this->mockLdap->shouldReceive('setVersion')->once();
+ $this->mockLdap->shouldReceive('setOption');
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
->andReturn(['count' => 1, 0 => [
@@
-129,4
+130,4
@@
class LdapTest extends BrowserKitTest
->dontSee('External Authentication');
}
-}
\ No newline at end of file
+}