diff options
Diffstat (limited to 'src/couch/test/eunit/couchdb_mrview_cors_tests.erl')
| -rw-r--r-- | src/couch/test/eunit/couchdb_mrview_cors_tests.erl | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/couch/test/eunit/couchdb_mrview_cors_tests.erl b/src/couch/test/eunit/couchdb_mrview_cors_tests.erl index 0f69048a0..a9215f5d7 100644 --- a/src/couch/test/eunit/couchdb_mrview_cors_tests.erl +++ b/src/couch/test/eunit/couchdb_mrview_cors_tests.erl @@ -70,8 +70,7 @@ show_tests() -> { "Check CORS for show", [ - make_test_case(clustered, [fun should_make_shows_request/2]), - make_test_case(backdoor, [fun should_make_shows_request/2]) + make_test_case(clustered, [fun should_make_shows_request/2]) ] }. @@ -86,22 +85,14 @@ should_make_shows_request(_, {Host, DbName}) -> ReqUrl = Host ++ "/" ++ DbName ++ "/_design/foo/_show/bar", Headers = [{"Origin", "http://example.com"}, {"Access-Control-Request-Method", "GET"}, ?AUTH], - {ok, _, Resp, Body} = test_request:get(ReqUrl, Headers), - Origin = proplists:get_value("Access-Control-Allow-Origin", Resp), - ?assertEqual("http://example.com", Origin), - ?assertEqual(<<"<h1>wosh</h1>">>, Body) + ?assertMatch({ok, 410, _, _}, test_request:get(ReqUrl, Headers)) end). -create_db(backdoor, DbName) -> - {ok, Db} = couch_db:create(DbName, [?ADMIN_CTX]), - couch_db:close(Db); create_db(clustered, DbName) -> {ok, Status, _, _} = test_request:put(db_url(DbName), [?AUTH], ""), assert_success(create_db, Status), ok. -delete_db(backdoor, DbName) -> - couch_server:delete(DbName, [?ADMIN_CTX]); delete_db(clustered, DbName) -> {ok, Status, _, _} = test_request:delete(db_url(DbName), [?AUTH]), assert_success(delete_db, Status), @@ -119,7 +110,6 @@ host_url(PortType) -> bind_address(PortType) -> config:get(section(PortType), "bind_address", "127.0.0.1"). -section(backdoor) -> "http"; section(clustered) -> "chttpd". db_url(DbName) when is_binary(DbName) -> @@ -128,9 +118,7 @@ db_url(DbName) when is_list(DbName) -> host_url(clustered) ++ "/" ++ DbName. port(clustered) -> - integer_to_list(mochiweb_socket_server:get(chttpd, port)); -port(backdoor) -> - integer_to_list(mochiweb_socket_server:get(couch_httpd, port)). + integer_to_list(mochiweb_socket_server:get(chttpd, port)). upload_ddoc(Host, DbName) -> |