diff options
| author | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
| commit | b97daaed9b513006ace7e8eb5232a2211e965e77 (patch) | |
| tree | e27002e8368e92410e5d4af2a945260c2ea6e2d1 /test/config | |
| parent | c6c4d9fd10b8ca8e24889112727e44c9bf68dd60 (diff) | |
| parent | 6eb2dae802e5453e2a4361ab28f614cce9294f4c (diff) | |
Merge remote-tracking branch 'origin/develop'
We'll only use the master branch for development from now on.
Diffstat (limited to 'test/config')
| -rw-r--r-- | test/config/README | 17 | ||||
| -rw-r--r-- | test/config/couchdb.admin.yml | 6 | ||||
| -rw-r--r-- | test/config/couchdb.yml | 5 |
3 files changed, 0 insertions, 28 deletions
diff --git a/test/config/README b/test/config/README deleted file mode 100644 index 58e37b2..0000000 --- a/test/config/README +++ /dev/null @@ -1,17 +0,0 @@ -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. diff --git a/test/config/couchdb.admin.yml b/test/config/couchdb.admin.yml deleted file mode 100644 index 0988bc1..0000000 --- a/test/config/couchdb.admin.yml +++ /dev/null @@ -1,6 +0,0 @@ -test: - auto_update_design_doc: false - username: "anna" - password: "secret" - prefix: "" - diff --git a/test/config/couchdb.yml b/test/config/couchdb.yml deleted file mode 100644 index 9c8b67b..0000000 --- a/test/config/couchdb.yml +++ /dev/null @@ -1,5 +0,0 @@ -test: - auto_update_design_doc: false - username: "me" - password: "pwd" - prefix: "" |