Merge remote-tracking branch 'ilya/2689-pass-options-to-test_request'
diff --git a/rebar.config.script b/rebar.config.script
index 09e11ad..34e645c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -81,7 +81,7 @@
BaseSpecs = [
%% couchjs
- {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS}]}]},
+ {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib"}]}]},
{"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
{"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib -lm"}]}]},
{"win32", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_WIN -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS}]}]},
diff --git a/src/couch_httpd_db.erl b/src/couch_httpd_db.erl
index 938521c..a3f2902 100644
--- a/src/couch_httpd_db.erl
+++ b/src/couch_httpd_db.erl
@@ -1131,6 +1131,9 @@
parse_changes_query(Req, Db) ->
ChangesArgs = lists:foldl(fun({Key, Value}, Args) ->
case {string:to_lower(Key), Value} of
+ {"feed", "live"} ->
+ %% sugar for continuous
+ Args#changes_args{feed="continuous"};
{"feed", _} ->
Args#changes_args{feed=Value};
{"descending", "true"} ->
diff --git a/src/test_util.erl b/src/test_util.erl
index f0ef82a..8d4d08b 100644
--- a/src/test_util.erl
+++ b/src/test_util.erl
@@ -69,10 +69,9 @@
start_couch(IniFiles, ExtraApps) ->
load_applications_with_stats(),
ok = application:set_env(config, ini_files, IniFiles),
- ok = lager:start(),
Apps = start_applications(
- [inets, ibrowse, ssl, config, couch_event, couch]
+ [goldrush, lager, inets, ibrowse, ssl, config, couch_event, couch]
++ ExtraApps),
#test_context{started = Apps}.
diff --git a/test/global_changes_tests.erl b/test/global_changes_tests.erl
index aa73898..273739e 100644
--- a/test/global_changes_tests.erl
+++ b/test/global_changes_tests.erl
@@ -7,12 +7,14 @@
Host = get_host(),
add_admin("admin", <<"pass">>),
DbName = "foo/" ++ ?b2l(?tempdb()),
- fabric:create_db(DbName, [?ADMIN_CTX]),
+ [fabric:create_db(Name, [?ADMIN_CTX])
+ || Name <- ["_global_changes", DbName]],
{Host, DbName}.
teardown({_, DbName}) ->
delete_admin("admin"),
- ok = fabric:delete_db(?l2b(DbName), [?ADMIN_CTX]),
+ [fabric:delete_db(Name, [?ADMIN_CTX])
+ || Name <- ["_global_changes", DbName]],
ok.
global_changes_test_() ->
