Merge pull request #1 from nickvergessen/functional-tests

Functional tests

Author: nickvergessen

.travis.yml

@@ -1,23 +1,42 @@
 language: php
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+
+matrix:
+  include:
+    - php: 5.3.3
+      env: DB=mysqli
+    - php: 5.3
+      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=mysqli
+    - php: 5.4
+      env: DB=mysql
+    - php: 5.4
+      env: DB=mariadb
+    - php: 5.4
+      env: DB=postgres
+    - php: 5.4
+      env: DB=sqlite3
+    - php: 5.5
+      env: DB=mysqli
+    - php: 5.6
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
 
 env:
   global:
-    - EXTNAME="phpbbde/movemessage"
-    - SNIFF="0"
-    - PHPBB_BRANCH="ticket/12483" # - PHPBB_BRANCH="develop-ascraeus"
-  matrix:
-    - DB=mysql
+    - EXTNAME="phpbbde/movemessage"  # CHANGE name of the extension HERE
+    - SNIFF="1"            # Should we run code sniffer on your code?
+    - IMAGE_ICC="1"        # Should we run icc profile sniffer on your images?
+    - PHPBB_BRANCH="develop-ascraeus"
 
 branches:
   only:
     - master
+    - develop
     - /^develop-.*$/
 
 install:
@@ -30,17 +49,6 @@ before_script:
   - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
 
 script:
-  - sh -c "if [ '$SNIFF' != '0' ]; then travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION; fi"
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
+  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
   - phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
-
-matrix:
-  include:
-    - php: 5.4
-      env: DB=mariadb
-    - php: 5.4
-      env: DB=postgres
-    - php: 5.4
-      env: DB=sqlite3
-  allow_failures:
-    - php: hhvm
-  fast_finish: true

composer.json

@@ -21,10 +21,12 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3.3"
 	},
 	"extra": {
-		"display-name": "phpBB.de - Move Message"
+		"display-name": "phpBB.de - Move Message",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }

event/main_listener.php

@@ -69,6 +69,8 @@ static public function getSubscribedEvents()
 	* @param \phpbb\db\driver\driver_interface	$db
 	* @param \phpbb\template\template	$template
 	* @param \phpbb\user				$user
+	* @param string				$phpbb_root_path
+	* @param string				$phpEx
 	*/
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path, $phpEx)
 	{

ext.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+*
+* @package phpBB.de Move Message
+* @copyright (c) 2014 phpBB.de
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbbde\movemessage\tests\functional;
+
+/**
+* @group functional
+*/
+class install_test extends \phpbb_functional_test_case
+{
+	static protected function setup_extensions()
+	{
+		return array('phpbbde/movemessage');
+	}
+
+	public function test_validate_viewtopic()
+	{
+		$crawler = self::request('GET', 'viewtopic.php?f=1&t=1');
+		$this->assertContains('Welcome to phpBB3', $crawler->filter('h2')->text());
+	}
+}