From fc94cbe8f9169fa816f646ce8361f9826da3d3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 2 Sep 2015 13:28:42 +0200
Subject: [PATCH] Travis CI update

---
 .travis.yml                |  8 +++-----
 config/database.yml.travis |  2 +-
 test/ci/redmine_install.sh | 26 +++++++++++---------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 972e5105..5c4c96d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
 language: ruby
 
-rvm:    
-  - 1.9.3
-  - 2.0.0
-  
+rvm:      
+  - 2.0.0  
 
 install: "echo skip bundle install"
 
@@ -16,4 +14,4 @@ script:
   - bash -x ./test/ci/redmine_install.sh -r
   - bash -x ./test/ci/redmine_install.sh -i
   - bash -x ./test/ci/redmine_install.sh -t
-  - bash -x ./test/ci/redmine_install.sh -u
+  - bash -x ./test/ci/redmine_install.sh -u
\ No newline at end of file
diff --git a/config/database.yml.travis b/config/database.yml.travis
index 2f53f663..cde3d574 100644
--- a/config/database.yml.travis
+++ b/config/database.yml.travis
@@ -4,4 +4,4 @@ development:
 
 test:
   adapter: sqlite3
-  database: db/redmine_development.sqlite3
+  database: db/redmine_development.sqlite3
\ No newline at end of file
diff --git a/test/ci/redmine_install.sh b/test/ci/redmine_install.sh
index a973ed4c..1bb3f981 100644
--- a/test/ci/redmine_install.sh
+++ b/test/ci/redmine_install.sh
@@ -45,7 +45,7 @@ run_tests()
 
   cd $PATH_TO_REDMINE 
 
-  # Run tests within application - for some reason redmine:plugins:test wont work under 1.8
+  # Run tests within application
   bundle exec rake redmine:plugins:test:units NAME=redmine_dmsf
   bundle exec rake redmine:plugins:test:functionals NAME=redmine_dmsf
   #bundle exec rake redmine:plugins:test:integration NAME=redmine_dmsf
@@ -63,39 +63,35 @@ uninstall()
 
 run_install()
 {
-  # exit if install fails
+  # Exit if install fails
   set -e
 
   # cd to redmine folder
   cd $PATH_TO_REDMINE
   echo current directory is `pwd`
 
-  # create a link to the dmsf plugin
+  # Create a link to the dmsf plugin
   ln -sf $PATH_TO_DMSF $PATH_TO_PLUGINS/redmine_dmsf
   
-  # install gems
+  # Install gems
   mkdir -p vendor/bundle
 
-  # copy database.yml
+  # Copy database.yml
   cp $WORKSPACE/database.yml config/
 
-  #Not ideal, but at present Travis-CI will not install with xapian enabled.
-  #02-04-2013 bundle install needs to happen AFTER database configuration
+  # Not ideal, but at present Travis-CI will not install with xapian enabled.  
   bundle install --path vendor/bundle --without xapian  
 
-  # run redmine database migrations
+  # Run Redmine database migrations
   bundle exec rake db:migrate RAILS_ENV=test --trace  
 
-  # Load redmine database default data  
+  # Load Redmine database default data  
   bundle exec rake redmine:load_default_data REDMINE_LANG=en RAILS_ENV=test
 
   # generate session store/secret token
   bundle exec rake $GENERATE_SECRET
-
-  # enable development features
-  #touch dmsf.dev
-
-  # run dmsf database migrations
+  
+  # Run the plugin database migrations
   bundle exec rake $MIGRATE_PLUGINS RAILS_ENV=test  
 }
 
@@ -107,4 +103,4 @@ do case "$opt" in
   u) uninstall; exit 0;;
   [?]) echo "i: install; r: clone redmine; t: run tests; u: uninstall";;
   esac
-done
+done
\ No newline at end of file