summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
committerelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
commite4679c66565d0ccae54ffc58a23083841e5585e7 (patch)
tree2cc7fbb5d3e6a48d21a605a8411da38ea8c999e3 /test
parent2365129a1dcbb1231f0ac22d4bf975007a0c460d (diff)
fix travis: use couchdb.admin.yml and pin travis ruby version to one that is installed on travis-ci.org
Diffstat (limited to 'test')
-rw-r--r--test/config/couchdb.admin.yml (renamed from test/config/couchdb.yml.admin)0
-rw-r--r--test/config/couchdb.yml (renamed from test/config/couchdb.yml.user)0
-rw-r--r--test/travis/ruby-version1
-rwxr-xr-xtest/travis/setup_couch.sh (renamed from test/setup_couch.sh)0
4 files changed, 1 insertions, 0 deletions
diff --git a/test/config/couchdb.yml.admin b/test/config/couchdb.admin.yml
index 0988bc1..0988bc1 100644
--- a/test/config/couchdb.yml.admin
+++ b/test/config/couchdb.admin.yml
diff --git a/test/config/couchdb.yml.user b/test/config/couchdb.yml
index 9c8b67b..9c8b67b 100644
--- a/test/config/couchdb.yml.user
+++ b/test/config/couchdb.yml
diff --git a/test/travis/ruby-version b/test/travis/ruby-version
new file mode 100644
index 0000000..68b3a4c
--- /dev/null
+++ b/test/travis/ruby-version
@@ -0,0 +1 @@
+1.9.3-p551
diff --git a/test/setup_couch.sh b/test/travis/setup_couch.sh
index 0502c12..0502c12 100755
--- a/test/setup_couch.sh
+++ b/test/travis/setup_couch.sh