", $message, $group);
+ }
+
+ /**
+ * Asserts that a warning is found in $this->content.
+ *
+ * @param string $message
+ * The message to pass on to the results.
+ * @param string $group
+ * The group to place the result in.
+ *
+ * @return bool
+ * TRUE on success, FALSE on failure.
+ */
+ public function assertWarning($message = '', $group = 'Other') {
+ if (!$message) {
+ $message = "Warning found on current page when warning was expected.";
+ }
+ return $this->assertRaw("
", $message, $group);
+ }
+
+ /**
+ * Asserts that no warning is found in $this->content.
+ *
+ * @param string $message
+ * The message to pass on to the results.
+ * @param string $group
+ * The group to place the result in.
+ *
+ * @return bool
+ * TRUE on success, FALSE on failure.
+ */
+ public function assertNoWarning($message = '', $group = 'Other') {
+ if (!$message) {
+ $message = "No warning found on current page when no warning was expected.";
+ }
+ return $this->assertNoRaw("
", $message, $group);
+ }
+
+ /**
+ * Makes a drupalPost() request, using the form submit button's ID.
+ *
+ * Because drupalPost() is silly and doesn't let us choose which button we'd
+ * like to select if multiple buttons have the same value, this function
+ * allows us to select whatever button we'd like based on the ID instead.
+ *
+ * This is done via the absolutely hilarious method of fudging the actual
+ * button labels that don't have the ID we want, so that the only one left
+ * with the correct label is the one with the right ID.
+ *
+ * @see DrupalWebTestCase::drupalPost()
+ *
+ * @param string $path
+ * Location of the post form.
+ * @param array $edit
+ * Field data in an associative array.
+ * @param string $submit
+ * Value of the submit button whose click is to be emulated.
+ * @param string $id
+ * ID of the submit button whose click is to be emulated.
+ * @param array $options
+ * Options to be forwarded to url().
+ * @param array $headers
+ * An array containing additional HTTP request headers, each formatted as
+ * "name: value".
+ * @param null $form_html_id
+ * (optional) HTML ID of the form to be submitted.
+ * @param null $extra_post
+ * (optional) A string of additional data to append to the POST submission.
+ *
+ * @return bool|string
+ * The content from the POST request's curlExec, or FALSE on fail.
+ */
+ public function drupalPostByID($path, $edit, $submit, $id, array $options = array(), array $headers = array(), $form_html_id = NULL, $extra_post = NULL) {
+ $buttons = $this->xpath("//input[@type=\"submit\" and @value=\"{$submit}\"]");
+ if (empty($buttons)) {
+ $this->fail("No buttons found on the page with value '$submit'");
+ return FALSE;
+ }
+ $i = 0;
+ foreach ($buttons as $button) {
+ if ($button['id'] !== $id) {
+ $button['value'] .= "_$i";
+ $i++;
+ }
+ }
+ return $this->drupalPost($path, $edit, $submit, $options, $headers, $form_html_id, $extra_post);
+ }
+
}
diff --git a/tests/scripts/travis_after_failure.sh b/tests/scripts/travis_after_failure.sh
new file mode 100755
index 00000000..f82c8e24
--- /dev/null
+++ b/tests/scripts/travis_after_failure.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Get the end portion of the TRAVIS_REPO_SLUG for the branch name.
+IFS=/ read -a DELIMITED_SLUG <<< "$TRAVIS_REPO_SLUG"
+export CURRENT_REPO=${DELIMITED_SLUG[1]}
+
+git config user.name --global islandora-logger
+git config user.email --global noreply@islandora.ca
+
+# Git business
+export VERBOSE_DIR = $HOME/sites/default/files/simpletest/verbose
+cd $HOME
+git clone https://islandora-logger:$LOGGER_PW@github.com/Islandora/islandora_travis_logs.git
+cd islandora_travis_logs
+git checkout -B $CURRENT_REPO
+
+# Out with the old, in with the new
+git rm $HOME/islandora_travis_logs/*.*
+cp $VERBOSE_DIR/*.* $HOME/islandora_travis_logs
+git add -A
+git commit -m "Job: $TRAVIS_JOB_NUMBER Commit: $TRAVIS_COMMIT"
+git push origin $CURRENT_REPO
diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
index c1bd7751..3991afcd 100755
--- a/tests/scripts/travis_setup.sh
+++ b/tests/scripts/travis_setup.sh
@@ -12,15 +12,16 @@ export CATALINA_HOME='.'
export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -Djavax.net.ssl.trustStore=$CATALINA_HOME/fedora/server/truststore -Djavax.net.ssl.trustStorePassword=tomcat"
./bin/startup.sh
cd $HOME
+pear channel-discover pear.drush.org
pear upgrade --force Console_Getopt
pear upgrade --force pear
-pear upgrade-all
-pear channel-discover pear.drush.org
pear channel-discover pear.drush.org
-pear channel-discover pear.phpqatools.org
-pear channel-discover pear.netpirates.net
-pear install pear/PHP_CodeSniffer-1.4.8
-pear install pear.phpunit.de/phpcpd
+
+# "prefer-source" required due to SSL shenanigans on the Travis boxes...
+composer global require --prefer-source 'squizlabs/php_codesniffer=*' 'sebastian/phpcpd=*'
+# Because we can't add to the PATH here and this file is used in many repos,
+# let's just throw symlinks in.
+find $HOME/.composer/vendor/bin -executable \! -type d -exec sudo ln -s {} /usr/local/sbin/ \;
# Install Drush
git clone https://github.com/drush-ops/drush.git
@@ -34,6 +35,10 @@ phpenv rehash
drush dl --yes drupal
cd drupal-*
drush si minimal --db-url=mysql://drupal:drupal@localhost/drupal --yes
+# Needs to make things from Composer be available (PHP CS, primarily)
+sudo chmod a+w sites/default/settings.php
+echo "include_once '$HOME/.composer/vendor/autoload.php';" >> sites/default/settings.php
+sudo chmod a-w sites/default/settings.php
drush runserver --php-cgi=$HOME/.phpenv/shims/php-cgi localhost:8081 &>/dev/null &
ln -s $ISLANDORA_DIR sites/all/modules/islandora
mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/islandora/tests/test_config.ini
diff --git a/theme/islandora-object.tpl.php b/theme/islandora-object.tpl.php
index fdd09607..f91c3272 100644
--- a/theme/islandora-object.tpl.php
+++ b/theme/islandora-object.tpl.php
@@ -61,13 +61,13 @@
-
-
-
-
-
-
-
+
-
+
+
+