Skip to content

Commit db996e4

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 f3d860a commit db996e4

2 files changed

Lines changed: 9 additions & 34 deletions

File tree

src/Behat/Mink/Session.php

Lines changed: 7 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
/**
@@ -24,7 +23,6 @@ class Session
2423
{
2524
private $driver;
2625
private $page;
27-
private $selectorsHandler;
2826

2927
/**
3028
* @var Element\ElementFinder
@@ -34,24 +32,18 @@ class Session
3432
/**
3533
* Initializes session.
3634
*
37-
* @param DriverInterface $driver
38-
* @param SelectorsHandler|null $selectorsHandler
39-
* @param ElementFinder|null $elementFinder
35+
* @param DriverInterface $driver
36+
* @param ElementFinder|null $elementFinder
4037
*/
41-
public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null, ElementFinder $elementFinder = null)
38+
public function __construct(DriverInterface $driver, ElementFinder $elementFinder = null)
4239
{
43-
if (null === $selectorsHandler) {
44-
$selectorsHandler = new SelectorsHandler();
45-
}
46-
4740
if (null === $elementFinder) {
48-
$elementFinder = new ElementFinder($driver, $selectorsHandler);
41+
$elementFinder = new ElementFinder($driver);
4942
}
5043

51-
$this->driver = $driver;
52-
$this->selectorsHandler = $selectorsHandler;
53-
$this->elementFinder = $elementFinder;
54-
$this->page = new DocumentElement($driver, $elementFinder);
44+
$this->driver = $driver;
45+
$this->elementFinder = $elementFinder;
46+
$this->page = new DocumentElement($driver, $elementFinder);
5547
}
5648

5749
/**
@@ -133,16 +125,6 @@ public function getPage()
133125
return $this->page;
134126
}
135127

136-
/**
137-
* Returns selectors handler.
138-
*
139-
* @return SelectorsHandler
140-
*/
141-
public function getSelectorsHandler()
142-
{
143-
return $this->selectorsHandler;
144-
}
145-
146128
/**
147129
* Visit specified URL.
148130
*

tests/SessionTest.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class SessionTest extends \PHPUnit_Framework_TestCase
1010
* @var \PHPUnit_Framework_MockObject_MockObject
1111
*/
1212
private $driver;
13-
private $selectorsHandler;
1413

1514
/**
1615
* Session.
@@ -21,9 +20,8 @@ class SessionTest extends \PHPUnit_Framework_TestCase
2120

2221
protected function setUp()
2322
{
24-
$this->driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
25-
$this->selectorsHandler = $this->getMockBuilder('Behat\Mink\Selector\SelectorsHandler')->getMock();
26-
$this->session = new Session($this->driver, $this->selectorsHandler);
23+
$this->driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
24+
$this->session = new Session($this->driver);
2725
}
2826

2927
public function testGetDriver()
@@ -36,11 +34,6 @@ public function testGetPage()
3634
$this->assertInstanceOf('Behat\Mink\Element\DocumentElement', $this->session->getPage());
3735
}
3836

39-
public function testGetSelectorsHandler()
40-
{
41-
$this->assertSame($this->selectorsHandler, $this->session->getSelectorsHandler());
42-
}
43-
4437
public function testIsStarted()
4538
{
4639
$this->driver->expects($this->once())

0 commit comments

Comments
 (0)