Skip to content

Commit e55cfbf

Browse files
committed
Removed the getter for the SelectorsHandler in the Session
This allows getting rid of the SelectorsHandler as a collaborator of the Session class. People needing to access the SelectorsHandler directly should instantiate the ElementFinder explicitly with a SelectorsHandler, and keep a reference to it.
1 parent abcca95 commit e55cfbf

2 files changed

Lines changed: 7 additions & 38 deletions

File tree

src/Session.php

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use Behat\Mink\Driver\DriverInterface;
1414
use Behat\Mink\Element\ElementFinder;
15-
use Behat\Mink\Selector\SelectorsHandler;
1615
use Behat\Mink\Element\DocumentElement;
1716

1817
/**
@@ -30,30 +29,20 @@ class Session
3029
* @var DocumentElement
3130
*/
3231
private $page;
33-
/**
34-
* @var SelectorsHandler
35-
*/
36-
private $selectorsHandler;
3732

3833
/**
3934
* Initializes session.
4035
*
41-
* @param DriverInterface $driver
42-
* @param SelectorsHandler|null $selectorsHandler
43-
* @param ElementFinder|null $elementFinder
36+
* @param DriverInterface $driver
37+
* @param ElementFinder|null $elementFinder
4438
*/
45-
public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null, ElementFinder $elementFinder = null)
39+
public function __construct(DriverInterface $driver, ElementFinder $elementFinder = null)
4640
{
47-
if (null === $selectorsHandler) {
48-
$selectorsHandler = new SelectorsHandler();
49-
}
50-
5141
if (null === $elementFinder) {
52-
$elementFinder = new ElementFinder($driver, $selectorsHandler);
42+
$elementFinder = new ElementFinder($driver);
5343
}
5444

5545
$this->driver = $driver;
56-
$this->selectorsHandler = $selectorsHandler;
5746
$this->page = new DocumentElement($driver, $elementFinder);
5847
}
5948

@@ -144,16 +133,6 @@ public function getPage()
144133
return $this->page;
145134
}
146135

147-
/**
148-
* Returns selectors handler.
149-
*
150-
* @return SelectorsHandler
151-
*/
152-
public function getSelectorsHandler()
153-
{
154-
return $this->selectorsHandler;
155-
}
156-
157136
/**
158137
* Visit specified URL and automatically start session if not already running.
159138
*

tests/SessionTest.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ class SessionTest extends TestCase
1414
* @var DriverInterface&MockObject
1515
*/
1616
private $driver;
17-
/**
18-
* @var SelectorsHandler
19-
*/
20-
private $selectorsHandler;
2117

2218
/**
2319
* Session.
@@ -32,8 +28,7 @@ class SessionTest extends TestCase
3228
protected function prepareSession(): void
3329
{
3430
$this->driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
35-
$this->selectorsHandler = $this->getMockBuilder('Behat\Mink\Selector\SelectorsHandler')->getMock();
36-
$this->session = new Session($this->driver, $this->selectorsHandler);
31+
$this->session = new Session($this->driver);
3732
}
3833

3934
public function testGetDriver()
@@ -46,16 +41,11 @@ public function testGetPage()
4641
$this->assertInstanceOf('Behat\Mink\Element\DocumentElement', $this->session->getPage());
4742
}
4843

49-
public function testGetSelectorsHandler()
50-
{
51-
$this->assertSame($this->selectorsHandler, $this->session->getSelectorsHandler());
52-
}
53-
5444
public function testInstantiateWithoutOptionalDeps()
5545
{
56-
$session = new Session($this->driver);
46+
new Session($this->driver);
5747

58-
$this->assertInstanceOf('Behat\Mink\Selector\SelectorsHandler', $session->getSelectorsHandler());
48+
$this->assertTrue(true, 'The instantiation should work.');
5949
}
6050

6151
public function testIsStarted()

0 commit comments

Comments
 (0)