From 661193e125c7170c4b44917db2da131678fb74e7 Mon Sep 17 00:00:00 2001
From: nruest <ruestn@gmail.com>
Date: Sun, 12 Jul 2015 22:27:47 -0400
Subject: [PATCH] Let's test more things

---
 islandora/tests/scripts/travis_setup.sh          | 14 ++++++--------
 islandora_apachesolr/islandora_apachesolr.module |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/islandora/tests/scripts/travis_setup.sh b/islandora/tests/scripts/travis_setup.sh
index a072de05..7431ebf9 100755
--- a/islandora/tests/scripts/travis_setup.sh
+++ b/islandora/tests/scripts/travis_setup.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 mysql -u root -e 'create database drupal;'
-#mysql -u root -e "create database fedora;"
-#mysql -u root -e "GRANT ALL PRIVILEGES ON fedora.* To 'fedora'@'localhost' IDENTIFIED BY 'fedora';"
 mysql -u root -e "GRANT ALL PRIVILEGES ON drupal.* To 'drupal'@'localhost' IDENTIFIED BY 'drupal';"
 cd $HOME
-#git clone git://github.com/Islandora/tuque.git
-#wget http://alpha.library.yorku.ca/islandora_tomcat.$FEDORA_VERSION.tar.gz
-#tar xf islandora_tomcat.$FEDORA_VERSION.tar.gz
 cd islandora_tomcat
 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"
@@ -35,9 +30,6 @@ cd drupal-*
 drush si minimal --db-url=mysql://drupal:drupal@localhost/drupal --yes
 drush runserver --php-cgi=$HOME/.phpenv/shims/php-cgi localhost:8081 &>/tmp/drush_webserver.log &
 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
-mkdir sites/all/libraries
-ln -s $HOME/tuque sites/all/libraries/tuque
 drush dl --yes coder-7.x-2.4
 drush dl --yes potx-7.x-1.0
 drush en --yes coder_review
@@ -46,6 +38,12 @@ drush en --yes potx
 drush dl --user=1 services
 drush en --user=1 --yes rest_server
 drush en --user=1 --yes islandora
+drush en --user=1 --yes islandora_apachesolr
+drush en --user=1 --yes islandora_basic_image
+drush en --user=1 --yes islandora_collection
+drush en --user=1 --yes islandora_dc
+drush en --user=1 --yes islandora_mods
+drush en --user=1 --yes islandora_rdf_mapping_service
 drush cc all
 # The shebang in this file is a bogeyman that is haunting the web test cases.
 rm /home/travis/.phpenv/rbenv.d/exec/hhvm-switcher.bash
diff --git a/islandora_apachesolr/islandora_apachesolr.module b/islandora_apachesolr/islandora_apachesolr.module
index 61fab698..8dc24f84 100644
--- a/islandora_apachesolr/islandora_apachesolr.module
+++ b/islandora_apachesolr/islandora_apachesolr.module
@@ -12,4 +12,3 @@ function islandora_apachesolr_apachesolr_index_documents_alter(array &$documents
     $documents[0]->ss_uuid = $entity->uuid;
   }
 }
-