Updated Branches: refs/heads/master 4117e041c -> cd9270f48
Remove duplicate CORS test Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cd9270f4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cd9270f4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cd9270f4 Branch: refs/heads/master Commit: cd9270f48aeadcd296a0e2f69f34e4a5989c0924 Parents: 4117e04 Author: Russell Branca <[email protected]> Authored: Thu Nov 7 15:56:18 2013 -0800 Committer: Russell Branca <[email protected]> Committed: Thu Nov 7 15:56:34 2013 -0800 ---------------------------------------------------------------------- test/etap/231-cors.t | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/cd9270f4/test/etap/231-cors.t ---------------------------------------------------------------------- diff --git a/test/etap/231-cors.t b/test/etap/231-cors.t index ec17526..dd08ca8 100644 --- a/test/etap/231-cors.t +++ b/test/etap/231-cors.t @@ -32,7 +32,7 @@ server() -> main(_) -> test_util:init_code_path(), - etap:plan(30), + etap:plan(28), case (catch test()) of ok -> etap:end_tests(); @@ -88,7 +88,6 @@ test() -> test_doc_with_attachment_request(), test_doc_with_attachment_range_request(), test_db_preflight_request(), - test_db_origin_request(), test_db1_origin_request(), test_preflight_with_port1(), test_preflight_with_scheme1(), @@ -129,7 +128,6 @@ test() -> test_preflight_request(true), test_db_request(true), test_db_preflight_request(true), - test_db_origin_request(true), test_db1_origin_request(true), test_preflight_with_port1(true), test_preflight_with_scheme1(true), @@ -160,7 +158,6 @@ test() -> test_preflight_request() -> test_preflight_request(false). test_db_request() -> test_db_request(false). test_db_preflight_request() -> test_db_preflight_request(false). -test_db_origin_request() -> test_db_origin_request(false). test_db1_origin_request() -> test_db1_origin_request(false). test_preflight_with_port1() -> test_preflight_with_port1(false). test_preflight_with_scheme1() -> test_preflight_with_scheme1(false). @@ -309,19 +306,6 @@ test_db_preflight_request(VHost) -> end. -test_db_origin_request(VHost) -> - Headers = [{"Origin", "http://example.com"}] - ++ maybe_append_vhost(VHost), - Url = server() ++ "etap-test-db", - case ibrowse:send_req(Url, Headers, get, []) of - {ok, _, RespHeaders, _Body} -> - etap:is(proplists:get_value("Access-Control-Allow-Origin", RespHeaders), - "http://example.com";, - "db origin ok"); - _ -> - etap:is(false, true, "ibrowse failed") - end. - test_db1_origin_request(VHost) -> Headers = [{"Origin", "http://example.com"}] ++ maybe_append_vhost(VHost),
