[WIP] Cleanup

composer.json

@@ -7,8 +7,10 @@
 	"license": "BSD-3-Clause",
 	"require": {
 		"php": ">=5.3.1",
-		"behat/mink-extension": "~2.0@dev",
-		"qa-tools/qa-tools": "*@dev"
+		"behat/mink-extension": "~2.0",
+		"qa-tools/qa-tools": "dev-develop",
+		"mindplay/annotations": "~1.2@dev",
+		"symfony/yaml": "2.6.4"
 	},
 	"require-dev": {
 		"aik099/coding-standard": "dev-master",

src/QATools/BehatExtension/Context/QAToolsContext.php

@@ -13,6 +13,8 @@
 
 use Behat\Behat\Context\Context;
 use QATools\BehatExtension\QATools;
+use QATools\QATools\PageObject\IPageFactory;
+use QATools\QATools\PageObject\Page;
 
 class QAToolsContext implements Context, IQAToolsAwareContext
 {
@@ -25,9 +27,23 @@ class QAToolsContext implements Context, IQAToolsAwareContext
 	protected $qaTools;
 
 	/**
-	 * Sets the QA-Tools instance.
+	 * The used page factory.
 	 *
-	 * @param QATools $qa_tools QA-Tools instance.
+	 * @var IPageFactory
+	 */
+	protected $pageFactory;
+
+	/**
+	 * The current page.
+	 *
+	 * @var Page
+	 */
+	protected $page;
+
+	/**
+	 * Set QA-Tools instance.
+	 *
+	 * @param QATools $qa_tools Instance of QA-Tools.
 	 *
 	 * @return static
 	 */
@@ -38,6 +54,20 @@ public function setQATools(QATools $qa_tools)
 		return $this;
 	}
 
+	/**
+	 * Set page factory.
+	 *
+	 * @param IPageFactory $page_factory Used page factory.
+	 *
+	 * @return static
+	 */
+	public function setPageFactory(IPageFactory $page_factory)
+	{
+		$this->pageFactory = $page_factory;
+
+		return $this;
+	}
+
 	/**
 	 * BeforeStep hook to init QA-Tools.
 	 *
@@ -49,6 +79,8 @@ public function initSession()
 	{
 		$this->qaTools->init();
 
+		$this->pageFactory = $this->qaTools->getPageFactory();
+
 		return $this;
 	}
 
@@ -57,14 +89,15 @@ public function initSession()
 	 *
 	 * @param string $page Name of page.
 	 *
+	 * @Given /^I visit the "([^"]+)"$/
 	 * @Given /^the user visits the "([^"]+)"$/
 	 *
 	 * @return void
 	 */
 	public function visitPage($page)
 	{
-		$page = $this->qaTools->getPage($page);
-		$page->open();
+		$this->page = $this->pageFactory->getPage($page);
+		$this->page->open();
 	}
 
 }

src/QATools/BehatExtension/QATools.php

@@ -13,9 +13,8 @@
 
 use Behat\Mink\Mink;
 use Behat\Mink\Session;
-use QATools\QATools\HtmlElements\TypifiedPageFactory;
 use QATools\QATools\PageObject\Config\Config;
-use QATools\QATools\PageObject\Page;
+use QATools\QATools\PageObject\IPageFactory;
 
 class QATools
 {
@@ -48,13 +47,6 @@ class QATools
 	 */
 	protected $users = array();
 
-	/**
-	 * The current active page.
-	 *
-	 * @var Page
-	 */
-	protected $activePage;
-
 	/**
 	 * Default constructor.
 	 *
@@ -87,40 +79,25 @@ public function init()
 	}
 
 	/**
-	 * Get page with given name.
-	 *
-	 * @param string $name Name of the page.
+	 * Creates a page factory.
 	 *
-	 * @return Page
+	 * @return IPageFactory
 	 */
-	public function getPage($name)
+	protected function createPageFactory()
 	{
-		$class = (isset($this->config['namespace']['pages']) ?
-				'\\' . $this->config['namespace']['pages'] . '\\' : '') . $name;
-
-		$this->activePage = $this->pageFactory->getPage($class);
+		$page_factory = $this->config['page_factory'];
 
-		return $this->activePage;
+		return new $page_factory($this->session, new Config($this->config['qa_tools']));
 	}
 
 	/**
-	 * Get active page.
-	 *
-	 * @return Page
-	 */
-	public function getActivePage()
-	{
-		return $this->activePage;
-	}
-
-	/**
-	 * Creates a page factory.
+	 * Get active page factory.
 	 *
 	 * @return IPageFactory
 	 */
-	public function createPageFactory()
+	public function getPageFactory()
 	{
-		return new TypifiedPageFactory($this->session, new Config($this->config['qa_tools']));
+		return $this->pageFactory;
 	}
 
 }