Merge pull request #104 from VSEphpbb/updates

Minor updates and testing

Author: iMattPro

.travis.yml

@@ -24,13 +24,12 @@ matrix:
       env: DB=mysqli
     - php: 7.1
       env: DB=mysqli
-    - php: nightly
+    - php: 7.2
       env: DB=mysqli
-    - php: hhvm
+    - php: nightly
       env: DB=mysqli
   allow_failures:
     - php: nightly
-    - php: hhvm
   fast_finish: true
 
 env:
@@ -55,6 +54,7 @@ install:
 
 before_script:
   - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - phantomjs --webdriver=8910 > /dev/null &
 
 script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"

composer.json

@@ -24,7 +24,7 @@
 		},
 		{
 			"name": "Matt Friedman",
-			"homepage": "http://mattfriedman.me",
+			"homepage": "http://vsephpbb.github.io",
 			"role": "Contributor"
 		},
 		{

phpunit.xml.dist

@@ -16,10 +16,14 @@
 		<testsuite name="Extension Test Suite">
 			<directory suffix="_test.php">./tests</directory>
 			<exclude>./tests/functional</exclude>
+			<exclude>./tests/ui</exclude>
 		</testsuite>
 		<testsuite name="Extension Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">./tests/functional/</directory>
 		</testsuite>
+		<testsuite name="Extension UI Tests">
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">./tests/ui/</directory>
+		</testsuite>
 	</testsuites>
 
 	<filter>

tests/controller/idea_controller_test.php

@@ -28,8 +28,10 @@ public function controller_test_data()
 			array(2, 'delete', 'delete', true, true, 'trigger_error', 200), // ajax delete success (confirm true)
 			array(3, 'duplicate', 'set_duplicate', true, true, 'true', 200), // ajax set duplicate success
 			array(3, 'duplicate', '', true, false, 'false', 200), // ajax set duplicate fail
-			array(4, 'removevote', 'remove_vote', true, true, 'true', 200), // ajax set title success
-			array(4, 'removevote', '', true, false, '"You do not have the necessary permissions to complete this operation."', 200), // ajax set title fail
+			array(4, 'removevote', 'remove_vote', true, true, 'true', 200), // ajax remove vote success
+			array(4, 'removevote', 'remove_vote', true, true, 'false', 200, ['idea_status' => \phpbb\ideas\factory\ideas::$statuses['DUPLICATE']]), // ajax remove vote not allowed
+			array(4, 'removevote', 'remove_vote', true, true, 'false', 200, ['idea_status' => \phpbb\ideas\factory\ideas::$statuses['IMPLEMENTED']]), // ajax remove vote not allowed
+			array(4, 'removevote', '', true, false, '"You do not have the necessary permissions to complete this operation."', 200), // ajax remove vote fail
 			array(5, 'rfc', 'set_rfc', true, true, 'true', 200), // ajax set rfc success
 			array(5, 'rfc', '', true, false, 'false', 200), // ajax set rfc fail
 			array(6, 'status', 'change_status', true, true, 'true', 200), // ajax set status success
@@ -38,8 +40,10 @@ public function controller_test_data()
 			array(7, 'ticket', '', true, false, 'false', 200), // ajax set ticket fail
 			array(8, 'title', 'set_title', true, true, 'true', 200), // ajax set title success
 			array(8, 'title', '', true, false, 'false', 200), // ajax set title fail
-			array(9, 'vote', 'vote', true, true, 'true', 200), // ajax set title success
-			array(9, 'vote', '', true, false, '"You do not have the necessary permissions to complete this operation."', 200), // ajax set title fail
+			array(9, 'vote', 'vote', true, true, 'true', 200), // ajax vote success
+			array(9, 'vote', 'vote', true, true, 'false', 200, ['idea_status' => \phpbb\ideas\factory\ideas::$statuses['DUPLICATE']]), // ajax vote not allowed
+			array(9, 'vote', 'vote', true, true, 'false', 200, ['idea_status' => \phpbb\ideas\factory\ideas::$statuses['IMPLEMENTED']]), // ajax vote not allowed
+			array(9, 'vote', '', true, false, '"You do not have the necessary permissions to complete this operation."', 200), // ajax vote fail
 			array(10, 'implemented', 'set_implemented', true, true, 'true', 200), // ajax set implemented success
 			array(10, 'implemented', '', true, false, 'false', 200), // ajax set implemented fail
 		);
@@ -50,15 +54,21 @@ public function controller_test_data()
 	 *
 	 * @dataProvider controller_test_data
 	 */
-	public function test_controller($idea_id, $mode, $callback, $is_ajax, $authorised, $expected, $status_code)
+	public function test_controller($idea_id, $mode, $callback, $is_ajax, $authorised, $expected, $status_code, $additional_data = [])
 	{
 		// mock some basic idea data
 		$this->ideas->expects($this->any())
 			->method('get_idea')
-			->will($this->returnValue(array('idea_id' => $idea_id, 'idea_author' => 2)));
+			->will($this->returnValue(
+				array_merge(array(
+					'idea_id'		=> $idea_id,
+					'idea_author'	=> 2,
+					'idea_status'	=> \phpbb\ideas\factory\ideas::$statuses['NEW']
+				), $additional_data))
+			);
 
 		// mock a result from each method called by the idea controller
-		if ($callback !== '')
+		if ($expected === 'true')
 		{
 			$this->ideas->expects($this->once())
 				->method(($callback))

tests/ui/ideas_test.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ *
+ * Ideas extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace phpbb\ideas\tests\ui;
+
+use Facebook\WebDriver\WebDriverKeys;
+
+/**
+ * @group ui
+ */
+class ideas_test extends \phpbb_ui_test_case
+{
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function setUpBeforeClass()
+	{
+		// Set these properties to true so we can use the same board created for functional tests
+		// instead of having to create and set up a whole new board.
+		self::$already_installed = true;
+		self::$install_success = true;
+		parent::setUpBeforeClass();
+	}
+
+	/**
+	 * Test JavaScript user interactions
+	 *
+	 * @throws \Facebook\WebDriver\Exception\NoSuchElementException
+	 * @throws \Facebook\WebDriver\Exception\TimeOutException
+	 */
+	public function test_js_actions()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$this->visit('app.php/idea/1');
+
+		// test showing the list of voters
+		$votes = $this->find_element('className', 'voteslist');
+		$this->assertEquals('none', $votes->getCSSValue('display'));
+		$this->find_element('className', 'votes')->click();
+		$this->assertEquals('block', $votes->getCSSValue('display'));
+
+		// test voting
+		$votedown = $this->find_element('className', 'minivotedown');
+		$this->assertEquals('0', $votedown->getText());
+		$votedown->click();
+		$this->waitForAjax();
+		$this->assertEquals('1', $this->find_element('className', 'minivotedown')->getText());
+
+		// test changing the status
+		$this->assertEquals('New', $this->find_element('className', 'status-badge')->getText());
+		$elements = $this->find_element('cssSelector', 'select#status')
+			->findElements(\Facebook\WebDriver\WebDriverBy::tagName('option'));
+		foreach ($elements as $element)
+		{
+			if ($element->getText() === 'In Progress')
+			{
+				$element->click();
+			}
+		}
+		$this->waitForAjax();
+		$this->assertEquals('In Progress', $this->find_element('className', 'status-badge')->getText());
+
+		// test showing the edit ticket input and entering text into it
+		$test = 'PHPBB3-123';
+		$input = $this->find_element('cssSelector', '#ticketeditinput');
+		$this->assertFalse($input->isDisplayed());
+		$this->find_element('cssSelector', '#ticketedit')->click();
+		$this->assertTrue($input->isDisplayed());
+		$input->sendKeys([$test, WebDriverKeys::ENTER]);
+		$this->waitForAjax();
+		$this->assertEquals($test, $this->find_element('cssSelector', '#ticketlink')->getText());
+	}
+
+	/**
+	 * Wait for AJAX, this should be added to the framework.
+	 *
+	 * @param string $framework javascript frameworks jquery|prototype|dojo
+	 * @throws \Facebook\WebDriver\Exception\NoSuchElementException
+	 * @throws \Facebook\WebDriver\Exception\TimeOutException
+	 */
+	public function waitForAjax($framework = 'jquery')
+	{
+		switch ($framework)
+		{
+			case 'jquery':
+				$code = 'return jQuery.active;';
+			break;
+			case 'prototype':
+				$code = 'return Ajax.activeRequestCount;';
+			break;
+			case 'dojo':
+				$code = 'return dojo.io.XMLHTTPTransport.inFlight.length;';
+			break;
+			default:
+				throw new \RuntimeException('Unsupported framework');
+			break;
+		}
+		// wait for at most 30s, retry every 2000ms (2s)
+		$driver = $this->getDriver();
+		$driver->wait(30, 2000)->until(
+			function () use ($driver, $code) {
+				return !$driver->executeScript($code);
+			}
+		);
+	}
+}