Merge pull request #132 from aik099/inline-session-factory

Integrated "SessionFactory" class into the "IsolatedSessionStrategy" class
minkphp · Mar 16, 2024 · 64070d5 · 64070d5
2 parents c621fe2 + 2588d78
commit 64070d5
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 180 deletions.
diff --git a/library/.phpstorm.meta.php b/library/.phpstorm.meta.php
@@ -2,7 +2,6 @@
 
 namespace PHPSTORM_META {
 	override(\aik099\PHPUnit\Application::getObject(), map([
-		'session_factory' => \aik099\PHPUnit\Session\SessionFactory::class,
 		'session_strategy_factory' => \aik099\PHPUnit\Session\SessionStrategyFactory::class,
 		'session_strategy_manager' => \aik099\PHPUnit\Session\SessionStrategyManager::class,
 		'remote_url' => \aik099\PHPUnit\RemoteCoverage\RemoteUrl::class,

diff --git a/library/aik099/PHPUnit/DIContainer.php b/library/aik099/PHPUnit/DIContainer.php
@@ -25,7 +25,6 @@
 use aik099\PHPUnit\RemoteCoverage\RemoteUrl;
 use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use aik099\PHPUnit\Session\IsolatedSessionStrategy;
-use aik099\PHPUnit\Session\SessionFactory;
 use aik099\PHPUnit\Session\SessionStrategyFactory;
 use aik099\PHPUnit\Session\SessionStrategyManager;
 use aik099\PHPUnit\Session\SharedSessionStrategy;
@@ -60,22 +59,18 @@ public function __construct(array $values = array())
 	{
 		parent::__construct($values);
 
-		$this['session_factory'] = function () {
-			return new SessionFactory();
-		};
-
 		$this['session_strategy_factory'] = function ($c) {
 			$session_strategy_factory = new SessionStrategyFactory();
 
 			$session_strategy_factory->register(
 				ISessionStrategyFactory::TYPE_ISOLATED,
-				new IsolatedSessionStrategy($c['session_factory'])
+				new IsolatedSessionStrategy()
 			);
 
 			$session_strategy_factory->register(
 				ISessionStrategyFactory::TYPE_SHARED,
 				new SharedSessionStrategy(
-					new IsolatedSessionStrategy($c['session_factory'])
+					new IsolatedSessionStrategy()
 				)
 			);
 

diff --git a/library/aik099/PHPUnit/Session/ISessionFactory.php b/library/aik099/PHPUnit/Session/ISessionFactory.php
diff --git a/library/aik099/PHPUnit/Session/IsolatedSessionStrategy.php b/library/aik099/PHPUnit/Session/IsolatedSessionStrategy.php
@@ -23,29 +23,12 @@
 class IsolatedSessionStrategy extends AbstractSessionStrategy
 {
 
-	/**
-	 * Session factory.
-	 *
-	 * @var ISessionFactory
-	 */
-	private $_sessionFactory;
-
-	/**
-	 * Creates isolated session strategy instance.
-	 *
-	 * @param ISessionFactory $session_factory Session factory.
-	 */
-	public function __construct(ISessionFactory $session_factory)
-	{
-		$this->_sessionFactory = $session_factory;
-	}
-
 	/**
 	 * @inheritDoc
 	 */
 	public function session(BrowserConfiguration $browser)
 	{
-		$session = $this->_sessionFactory->createSession($browser);
+		$session = new Session($browser->createDriver());
 		$this->isFreshSession = true;
 
 		return $session;

diff --git a/library/aik099/PHPUnit/Session/SessionFactory.php b/library/aik099/PHPUnit/Session/SessionFactory.php
diff --git a/tests/aik099/PHPUnit/Integration/DIContainerTest.php b/tests/aik099/PHPUnit/Integration/DIContainerTest.php
@@ -28,7 +28,6 @@
 use aik099\PHPUnit\RemoteCoverage\RemoteUrl;
 use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use aik099\PHPUnit\Session\IsolatedSessionStrategy;
-use aik099\PHPUnit\Session\SessionFactory;
 use aik099\PHPUnit\Session\SessionStrategyFactory;
 use aik099\PHPUnit\Session\SessionStrategyManager;
 use aik099\PHPUnit\Session\SharedSessionStrategy;
@@ -82,7 +81,6 @@ public static function serviceDefinitionsDataProvider()
 	{
 		return array(
 			array('application', Application::class),
-			array('session_factory', SessionFactory::class),
 			array('session_strategy_factory', SessionStrategyFactory::class),
 			array('session_strategy_manager', SessionStrategyManager::class),
 			array('remote_url', RemoteUrl::class),

diff --git a/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php b/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php
@@ -11,28 +11,20 @@
 namespace tests\aik099\PHPUnit\Session;
 
 
-use aik099\PHPUnit\Session\ISessionFactory;
 use aik099\PHPUnit\Session\IsolatedSessionStrategy;
+use Behat\Mink\Driver\DriverInterface;
+use Behat\Mink\Session;
 use Mockery as m;
-use Mockery\MockInterface;
 
 class IsolatedSessionStrategyTest extends AbstractSessionStrategyTestCase
 {
 
-	/**
-	 * Session factory.
-	 *
-	 * @var ISessionFactory|MockInterface
-	 */
-	private $_factory;
-
 	/**
 	 * @before
 	 */
 	protected function setUpTest()
 	{
-		$this->_factory = m::mock(ISessionFactory::class);
-		$this->strategy = new IsolatedSessionStrategy($this->_factory);
+		$this->strategy = new IsolatedSessionStrategy();
 	}
 
 	/**
@@ -44,25 +36,30 @@ public function testSession()
 	{
 		$browser = m::mock(self::BROWSER_CLASS);
 
-		$session1 = m::mock(self::SESSION_CLASS);
-		$session2 = m::mock(self::SESSION_CLASS);
+		$driver1 = m::mock(DriverInterface::class);
+		$driver1->shouldReceive('setSession')->with(m::type(Session::class))->once();
+
+		$driver2 = m::mock(DriverInterface::class);
+		$driver2->shouldReceive('setSession')->with(m::type(Session::class))->once();
 
-		$this->_factory
-			->shouldReceive('createSession')
-			->with($browser)
-			->twice()
-			->andReturn($session1, $session2);
+		$browser->shouldReceive('createDriver')->twice()->andReturn($driver1, $driver2);
 
-		$this->assertEquals($session1, $this->strategy->session($browser));
-		$this->assertEquals($session2, $this->strategy->session($browser));
+		$session1 = $this->strategy->session($browser);
+		$this->assertInstanceOf(Session::class, $session1);
+		$this->assertSame($driver1, $session1->getDriver());
+
+		$session2 = $this->strategy->session($browser);
+		$this->assertInstanceOf(Session::class, $session2);
+		$this->assertSame($driver2, $session2->getDriver());
 	}
 
 	public function testIsFreshSessionAfterSessionIsStarted()
 	{
-		$browser = m::mock(self::BROWSER_CLASS);
-		$session = m::mock(self::SESSION_CLASS);
+		$driver = m::mock(DriverInterface::class);
+		$driver->shouldReceive('setSession')->with(m::type(Session::class))->once();
 
-		$this->_factory->shouldReceive('createSession')->with($browser)->once()->andReturn($session);
+		$browser = m::mock(self::BROWSER_CLASS);
+		$browser->shouldReceive('createDriver')->once()->andReturn($driver);
 
 		$this->strategy->session($browser);
 

diff --git a/tests/aik099/PHPUnit/Session/SessionFactoryTest.php b/tests/aik099/PHPUnit/Session/SessionFactoryTest.php