summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-12-19 17:03:42 -0800
committerelijah <elijah@riseup.net>2014-12-19 17:04:06 -0800
commit1d2c6dd8ea1e40e24b1ae958455c4297e0019d96 (patch)
tree7e2336bdc0bb004f8aec494c74d24b7a5e658d2c
parentc9e2ec9b886a44fea406fdd8a21cc8bc6cc228da (diff)
attempt to fix travis configuration
-rw-r--r--.travis.yml3
-rw-r--r--test/config/README17
2 files changed, 18 insertions, 2 deletions
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.