From 4bed9be57d671324921bfd1d90d25b8cd0af3d4f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 1 Dec 2018 18:25:32 +0300 Subject: js-ification: start on some common dialogs --- tests/functional/BasicTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/functional') diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php index dc44a67e1..c5bc70b4e 100644 --- a/tests/functional/BasicTest.php +++ b/tests/functional/BasicTest.php @@ -30,7 +30,7 @@ class BasicTest extends PHPUnit_Extensions_Selenium2TestCase { $this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]); - $this->execute(["script" => "quickAddFeed()", "args" => []]); + $this->execute(["script" => "CommonDialog.quickAddFeed()", "args" => []]); $this->byCssSelector("#feedAddDlg")->displayed(); $this->execute(["script" => "dijit.byId('feedAddDlg').hide();", "args" => []]); -- cgit v1.2.3 From 1e2d4410d320fcee644add76293f229741a163cb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 1 Dec 2018 22:39:29 +0300 Subject: move some more shared stuff to CommonDialogs, Filters, and Utils --- tests/functional/BasicTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/functional') diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php index c5bc70b4e..eba8a2c89 100644 --- a/tests/functional/BasicTest.php +++ b/tests/functional/BasicTest.php @@ -25,7 +25,7 @@ class BasicTest extends PHPUnit_Extensions_Selenium2TestCase { public function testBasicDialogs() { $this->testLogin(); - $this->execute(["script" => "quickAddFilter()", "args" => []]); + $this->execute(["script" => "Filters.quickAddFilter()", "args" => []]); $this->byCssSelector("#filterEditDlg")->displayed(); $this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]); -- cgit v1.2.3 From 50a4c2d7236841f5bf23ab4c47529fef3b1dda2e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Dec 2018 15:05:22 +0300 Subject: remove selenium stuff --- tests/functional/BasicTest.php | 46 ------------------------------------------ tests/functional/PrefsTest.php | 42 -------------------------------------- 2 files changed, 88 deletions(-) delete mode 100644 tests/functional/BasicTest.php delete mode 100644 tests/functional/PrefsTest.php (limited to 'tests/functional') diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php deleted file mode 100644 index eba8a2c89..000000000 --- a/tests/functional/BasicTest.php +++ /dev/null @@ -1,46 +0,0 @@ -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" => "Filters.quickAddFilter()", "args" => []]); - $this->byCssSelector("#filterEditDlg")->displayed(); - - $this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]); - - $this->execute(["script" => "CommonDialog.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 > .header')->displayed(); - } -} diff --git a/tests/functional/PrefsTest.php b/tests/functional/PrefsTest.php deleted file mode 100644 index 4f2dea4b7..000000000 --- a/tests/functional/PrefsTest.php +++ /dev/null @@ -1,42 +0,0 @@ -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(); - - } -} -- cgit v1.2.3