Compare commits

..

No commits in common. "master" and "testing" have entirely different histories.

4 changed files with 25 additions and 67 deletions

View file

@ -1,5 +1,4 @@
language: php language: php
sudo: false
php: php:
- 5.3 - 5.3

View file

@ -12,50 +12,23 @@ DB_HOST=${4-localhost}
WP_VERSION=${5-latest} WP_VERSION=${5-latest}
WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib} WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/} WP_CORE_DIR=/tmp/wordpress/
download() {
if [ `which curl` ]; then
curl -s "$1" > "$2";
elif [ `which wget` ]; then
wget -nv -O "$2" "$1"
fi
}
if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
WP_TESTS_TAG="tags/$WP_VERSION"
else
# http serves a single offer, whereas https serves multiple. we only want one
download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json
grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
if [[ -z "$LATEST_VERSION" ]]; then
echo "Latest WordPress version could not be found"
exit 1
fi
WP_TESTS_TAG="tags/$LATEST_VERSION"
fi
set -ex set -ex
install_wp() { install_wp() {
if [ -d $WP_CORE_DIR ]; then
return;
fi
mkdir -p $WP_CORE_DIR mkdir -p $WP_CORE_DIR
if [ $WP_VERSION == 'latest' ]; then if [ $WP_VERSION == 'latest' ]; then
local ARCHIVE_NAME='latest' local ARCHIVE_NAME='latest'
else else
local ARCHIVE_NAME="wordpress-$WP_VERSION" local ARCHIVE_NAME="wordpress-$WP_VERSION"
fi fi
download https://wordpress.org/${ARCHIVE_NAME}.tar.gz /tmp/wordpress.tar.gz wget -nv -O /tmp/wordpress.tar.gz http://wordpress.org/${ARCHIVE_NAME}.tar.gz
tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php wget -nv -O $WP_CORE_DIR/wp-content/db.php https://raw.github.com/markoheijnen/wp-mysqli/master/db.php
} }
install_test_suite() { install_test_suite() {
@ -66,24 +39,17 @@ install_test_suite() {
local ioption='-i' local ioption='-i'
fi fi
# set up testing suite if it doesn't yet exist # set up testing suite
if [ ! -d $WP_TESTS_DIR ]; then mkdir -p $WP_TESTS_DIR
# set up testing suite
mkdir -p $WP_TESTS_DIR
svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
fi
cd $WP_TESTS_DIR cd $WP_TESTS_DIR
svn co --quiet http://develop.svn.wordpress.org/trunk/tests/phpunit/includes/
if [ ! -f wp-tests-config.php ]; then wget -nv -O wp-tests-config.php http://develop.svn.wordpress.org/trunk/wp-tests-config-sample.php
download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" wp-tests-config.php
sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" wp-tests-config.php
sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/yourusernamehere/$DB_USER/" wp-tests-config.php
sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s/yourpasswordhere/$DB_PASS/" wp-tests-config.php
sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php sed $ioption "s|localhost|${DB_HOST}|" wp-tests-config.php
sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php
fi
} }
install_db() { install_db() {
@ -94,7 +60,7 @@ install_db() {
local EXTRA="" local EXTRA=""
if ! [ -z $DB_HOSTNAME ] ; then if ! [ -z $DB_HOSTNAME ] ; then
if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then if [[ "$DB_SOCK_OR_PORT" =~ ^[0-9]+$ ]] ; then
EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp" EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
elif ! [ -z $DB_SOCK_OR_PORT ] ; then elif ! [ -z $DB_SOCK_OR_PORT ] ; then
EXTRA=" --socket=$DB_SOCK_OR_PORT" EXTRA=" --socket=$DB_SOCK_OR_PORT"

View file

@ -3,7 +3,7 @@
Plugin Name: Freifunk Metadata Shortcodes Plugin Name: Freifunk Metadata Shortcodes
Plugin URI: http://mschuette.name/ Plugin URI: http://mschuette.name/
Description: Defines shortcodes to display Freifunk metadata Description: Defines shortcodes to display Freifunk metadata
Version: 0.4 Version: 0.4dev
Author: Martin Schuette Author: Martin Schuette
Author URI: http://mschuette.name/ Author URI: http://mschuette.name/
*/ */
@ -294,18 +294,15 @@ EOT;
return ''; return '';
} }
$services = $citydata['services']; $services = $citydata['services'];
$outstr = '<table><th>Dienst</th><th>Beschreibung</th><th>Freifunk URI</th><th>Internet URI</th>'; $outstr = '<ul>';
foreach ( $services as $service ) { foreach ( $services as $service ) {
$internalUri = isset($service['internalUri']) ? $service['internalUri'] : ''; $outstr .= sprintf(
$externalUri = isset($service['externalUri']) ? $service['externalUri'] : ''; '<li>%s (%s): <a href="%s">%s</a></li>',
$outstr .= sprintf( $service['serviceName'], $service['serviceDescription'],
'<tr><td>%s</td><td>%s</td><td><a href="%s">%s</a></td><td><a href="%s">%s</a></td></tr>', $service['internalUri'], $service['internalUri']
$service['serviceName'], $service['serviceDescription'], );
$internalUri, $internalUri, }
$externalUri, $externalUri $outstr .= '</ul>';
);
}
$outstr .= '</table>';
return $outstr; return $outstr;
} }

View file

@ -126,13 +126,9 @@ class LowLevelTests extends PHPUnit_Framework_TestCase {
'serviceName' => 'jabber', 'serviceName' => 'jabber',
'serviceDescription' => 'chat', 'serviceDescription' => 'chat',
'internalUri' => 'xmpp://jabber.local', 'internalUri' => 'xmpp://jabber.local',
'externalUri' => 'xmpp://jabber.example.org',
))); )));
$ret = $this->FFM->output_ff_services($data); $ret = $this->FFM->output_ff_services($data);
$this->assertEquals('<table><th>Dienst</th><th>Beschreibung</th><th>Freifunk URI</th><th>Internet URI</th>'. $this->assertEquals('<ul><li>jabber (chat): <a href="xmpp://jabber.local">xmpp://jabber.local</a></li></ul>', $ret);
'<tr><td>jabber</td><td>chat</td><td><a href="xmpp://jabber.local">xmpp://jabber.local</a></td>'.
'<td><a href="xmpp://jabber.example.org">xmpp://jabber.example.org</a></td></tr>'.
'</table>', $ret);
} }
function test_output_ff_contact_null() { function test_output_ff_contact_null() {