From 1d2c6dd8ea1e40e24b1ae958455c4297e0019d96 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 19 Dec 2014 17:03:42 -0800
Subject: attempt to fix travis configuration

---
 .travis.yml        |  3 +--
 test/config/README | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 test/config/README

diff --git a/.travis.yml b/.travis.yml
index 69981b0..90822f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,7 @@ notifications:
 before_script:
   - "test/setup_couch.sh"
   - "mv test/config/couchdb.yml.admin config/couchdb.yml"
-  - "bundle exec rake couchrest:migrate_with_proxies"
-  - "bundle exec rake couchrest:migrate_with_proxies"  # looks like this needs to run twice
+  - "bundle exec rake RAILS_ENV=test couchrest:migrate_with_proxies"
   - "mv test/config/couchdb.yml.user config/couchdb.yml"
 after_script:
   - "cat tmp/*.test*.log" # printing logs from the failed integration tests
diff --git a/test/config/README b/test/config/README
new file mode 100644
index 0000000..58e37b2
--- /dev/null
+++ b/test/config/README
@@ -0,0 +1,17 @@
+These files are used for Travis tests to test admin and user permissions:
+
+couchdb.yml.admin:
+
+  when activated, leap_web has admin permissions (e.g. ability to create
+  databases, upload design docs).
+
+couchdb.yml.user:
+
+  when activited, leap_web has normal permissions (e.g. can modify all the
+  records).
+
+The term 'user' here is misleading. It is really two different types of admin
+permissions.
+
+Rails or rake must be run with 'test' environment for these configs to be
+used.
-- 
cgit v1.2.3