rename functional tests

diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php
new file mode 100644 (file)
index 0000000..58041ac
--- /dev/null
+++ b/tests/functional/BasicTest.php
@@ -0,0 +1,46 @@
+<?php
+class BasicTest extends PHPUnit_Extensions_Selenium2TestCase {
+
+       public function setUp() {
+               $this->setHost('localhost');
+               $this->setPort(4444);
+               $this->setBrowserUrl('http://localhost/tt-rss/');
+               $this->setBrowser('firefox');
+       }
+
+       public function setUpPage() {
+               $this->timeouts()->implicitWait(5000);
+       }
+
+       public function testLogin() {
+               $this->url('/index.php');
+
+               $this->byName("login")->value('admin');
+               $this->byName("password")->value('password');
+               $this->byCssSelector('#dijit_form_Button_0_label')->click();
+
+               $this->byCssSelector('#feedTree')->displayed();
+       }
+
+       public function testBasicDialogs() {
+               $this->testLogin();
+
+               $this->execute(["script" => "quickAddFilter()", "args" => []]);
+               $this->byCssSelector("#filterEditDlg")->displayed();
+
+               $this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]);
+
+               $this->execute(["script" => "quickAddFeed()", "args" => []]);
+               $this->byCssSelector("#feedAddDlg")->displayed();
+
+               $this->execute(["script" => "dijit.byId('feedAddDlg').hide();", "args" => []]);
+       }
+
+       public function testOpenFeed() {
+               $this->testLogin();
+
+               $this->byCssSelector('#dijit__TreeNode_3')->click();
+
+               $this->byCssSelector('#RROW-1 > div.cdmHeader')->displayed();
+       }
+}

diff --git a/tests/functional/PrefsTest.php b/tests/functional/PrefsTest.php
new file mode 100644 (file)
index 0000000..4f2dea4
--- /dev/null
+++ b/tests/functional/PrefsTest.php
@@ -0,0 +1,42 @@
+<?php
+class BasicTest extends PHPUnit_Extensions_Selenium2TestCase {
+
+       public function setUp() {
+               $this->setHost('localhost');
+               $this->setPort(4444);
+               $this->setBrowserUrl('http://localhost/tt-rss/');
+               $this->setBrowser('firefox');
+       }
+
+       public function setUpPage() {
+               $this->timeouts()->implicitWait(5000);
+       }
+
+       public function testLogin() {
+               $this->url('/prefs.php');
+
+               $this->byName("login")->value('admin');
+               $this->byName("password")->value('password');
+               $this->byCssSelector('#dijit_form_Button_0_label')->click();
+
+               $this->byCssSelector('#ttrssPrefs')->displayed();
+       }
+
+       public function testTabs() {
+
+               $this->byCssSelector("#dijit_layout_AccordionPane_1_wrapper")->displayed();
+
+               /* feeds */
+               $this->execute(["script" => "selectTab('feedConfig');", "args" => []]);
+               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
+
+               /* filters */
+               $this->execute(["script" => "selectTab('filterConfig');", "args" => []]);
+               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
+
+               /* filters */
+               $this->execute(["script" => "selectTab('labelConfig');", "args" => []]);
+               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
+
+       }
+}

diff --git a/tests/functional/basic.php b/tests/functional/basic.php
deleted file mode 100644 (file)
index 58041ac..0000000
--- a/tests/functional/basic.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-class BasicTest extends PHPUnit_Extensions_Selenium2TestCase {
-
-       public function setUp() {
-               $this->setHost('localhost');
-               $this->setPort(4444);
-               $this->setBrowserUrl('http://localhost/tt-rss/');
-               $this->setBrowser('firefox');
-       }
-
-       public function setUpPage() {
-               $this->timeouts()->implicitWait(5000);
-       }
-
-       public function testLogin() {
-               $this->url('/index.php');
-
-               $this->byName("login")->value('admin');
-               $this->byName("password")->value('password');
-               $this->byCssSelector('#dijit_form_Button_0_label')->click();
-
-               $this->byCssSelector('#feedTree')->displayed();
-       }
-
-       public function testBasicDialogs() {
-               $this->testLogin();
-
-               $this->execute(["script" => "quickAddFilter()", "args" => []]);
-               $this->byCssSelector("#filterEditDlg")->displayed();
-
-               $this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]);
-
-               $this->execute(["script" => "quickAddFeed()", "args" => []]);
-               $this->byCssSelector("#feedAddDlg")->displayed();
-
-               $this->execute(["script" => "dijit.byId('feedAddDlg').hide();", "args" => []]);
-       }
-
-       public function testOpenFeed() {
-               $this->testLogin();
-
-               $this->byCssSelector('#dijit__TreeNode_3')->click();
-
-               $this->byCssSelector('#RROW-1 > div.cdmHeader')->displayed();
-       }
-}

diff --git a/tests/functional/prefs.php b/tests/functional/prefs.php
deleted file mode 100644 (file)
index 4f2dea4..0000000
--- a/tests/functional/prefs.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-class BasicTest extends PHPUnit_Extensions_Selenium2TestCase {
-
-       public function setUp() {
-               $this->setHost('localhost');
-               $this->setPort(4444);
-               $this->setBrowserUrl('http://localhost/tt-rss/');
-               $this->setBrowser('firefox');
-       }
-
-       public function setUpPage() {
-               $this->timeouts()->implicitWait(5000);
-       }
-
-       public function testLogin() {
-               $this->url('/prefs.php');
-
-               $this->byName("login")->value('admin');
-               $this->byName("password")->value('password');
-               $this->byCssSelector('#dijit_form_Button_0_label')->click();
-
-               $this->byCssSelector('#ttrssPrefs')->displayed();
-       }
-
-       public function testTabs() {
-
-               $this->byCssSelector("#dijit_layout_AccordionPane_1_wrapper")->displayed();
-
-               /* feeds */
-               $this->execute(["script" => "selectTab('feedConfig');", "args" => []]);
-               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
-
-               /* filters */
-               $this->execute(["script" => "selectTab('filterConfig');", "args" => []]);
-               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
-
-               /* filters */
-               $this->execute(["script" => "selectTab('labelConfig');", "args" => []]);
-               $this->byCssSelector("div.dijitTreeContainer > div.dijitTreeNode")->displayed();
-
-       }
-}