ElSBMc3Q2LBNMjlg1ECPw changeset

Changeset303638316466 (b)
ParentNone (a)
ab
0+diff --git a/test/etap/160-vhosts.t b/test/etap/160-vhosts.t
0+index 89a71de..729c2f7 100755
0+--- a/test/etap/160-vhosts.t
0++++ b/test/etap/160-vhosts.t
0+@@ -155,9 +155,9 @@ test_regular_request() ->
0+ test_vhost_request() ->
0+     case ibrowse:send_req(server(), [], get, [], [{host_header, "example.com"}]) of
0+         {ok, _, _, Body} ->
0+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
0+-                = ejson:decode(Body),
0+-            etap:is(true, true, "should return database info");
0++            {JsonBody} = ejson:decode(Body),
0++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
0++            etap:is(HasDbNameInfo, true, "should return database info");
0+         _Else ->
0+            etap:is(false, true, <<"ibrowse fail">>)
0+     end.
0+@@ -222,9 +222,9 @@ test_vhost_request_wildcard()->
0+ test_vhost_request_replace_var() ->
0+     case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example1.com"}]) of
0+         {ok, _, _, Body} ->
0+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
0+-                = ejson:decode(Body),
0+-            etap:is(true, true, "should return database info");
0++            {JsonBody} = ejson:decode(Body),
0++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
0++            etap:is(HasDbNameInfo, true, "should return database info");
0+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
0+     end.
0+ 
0+@@ -242,9 +242,9 @@ test_vhost_request_replace_var1() ->
0+ test_vhost_request_replace_wildcard() ->
0+     case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
0+         {ok, _, _, Body} ->
0+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
0+-                = ejson:decode(Body),
0+-            etap:is(true, true, "should return database info");
0++            {JsonBody} = ejson:decode(Body),
0++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
0++            etap:is(HasDbNameInfo, true, "should return database info");
0+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
0+     end.
0+ 
0+@@ -252,9 +252,9 @@ test_vhost_request_path() ->
0+     Uri = server() ++ "test",
0+     case ibrowse:send_req(Uri, [], get, [], [{host_header, "example.com"}]) of
0+         {ok, _, _, Body} ->
0+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
0+-                = ejson:decode(Body),
0+-            etap:is(true, true, "should return database info");
0++            {JsonBody} = ejson:decode(Body),
0++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
0++            etap:is(HasDbNameInfo, true, "should return database info");
0+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
0+     end.
0+ 
0+@@ -272,9 +272,9 @@ test_vhost_request_path2() ->
0+     Uri = server() ++ "test",
0+     case ibrowse:send_req(Uri, [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
0+         {ok, _, _, Body} ->
0+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
0+-                = ejson:decode(Body),
0+-            etap:is(true, true, "should return database info");
0++            {JsonBody} = ejson:decode(Body),
0++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
0++            etap:is(HasDbNameInfo, true, "should return database info");
0+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
0+     end.
0+ 
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
--- Revision None
+++ Revision 303638316466
@@ -0,0 +1,69 @@
+diff --git a/test/etap/160-vhosts.t b/test/etap/160-vhosts.t
+index 89a71de..729c2f7 100755
+--- a/test/etap/160-vhosts.t
++++ b/test/etap/160-vhosts.t
+@@ -155,9 +155,9 @@ test_regular_request() ->
+ test_vhost_request() ->
+     case ibrowse:send_req(server(), [], get, [], [{host_header, "example.com"}]) of
+         {ok, _, _, Body} ->
+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
+-                = ejson:decode(Body),
+-            etap:is(true, true, "should return database info");
++            {JsonBody} = ejson:decode(Body),
++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
++            etap:is(HasDbNameInfo, true, "should return database info");
+         _Else -> 
+            etap:is(false, true, <<"ibrowse fail">>)
+     end.
+@@ -222,9 +222,9 @@ test_vhost_request_wildcard()->
+ test_vhost_request_replace_var() ->
+     case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example1.com"}]) of
+         {ok, _, _, Body} ->
+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
+-                = ejson:decode(Body),
+-            etap:is(true, true, "should return database info");
++            {JsonBody} = ejson:decode(Body),
++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
++            etap:is(HasDbNameInfo, true, "should return database info");
+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
+     end.
+ 
+@@ -242,9 +242,9 @@ test_vhost_request_replace_var1() ->
+ test_vhost_request_replace_wildcard() ->
+     case ibrowse:send_req(server(), [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
+         {ok, _, _, Body} ->
+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
+-                = ejson:decode(Body),
+-            etap:is(true, true, "should return database info");
++            {JsonBody} = ejson:decode(Body),
++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
++            etap:is(HasDbNameInfo, true, "should return database info");
+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
+     end.
+ 
+@@ -252,9 +252,9 @@ test_vhost_request_path() ->
+     Uri = server() ++ "test",
+     case ibrowse:send_req(Uri, [], get, [], [{host_header, "example.com"}]) of
+         {ok, _, _, Body} ->
+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
+-                = ejson:decode(Body),
+-            etap:is(true, true, "should return database info");
++            {JsonBody} = ejson:decode(Body),
++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
++            etap:is(HasDbNameInfo, true, "should return database info");
+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
+     end.
+ 
+@@ -272,9 +272,9 @@ test_vhost_request_path2() ->
+     Uri = server() ++ "test",
+     case ibrowse:send_req(Uri, [], get, [], [{host_header,"etap-test-db.example2.com"}]) of
+         {ok, _, _, Body} ->
+-            {[{<<"db_name">>, <<"etap-test-db">>},_,_,_,_,_,_,_,_,_]}
+-                = ejson:decode(Body),
+-            etap:is(true, true, "should return database info");
++            {JsonBody} = ejson:decode(Body),
++            HasDbNameInfo = proplists:is_defined(<<"db_name">>, JsonBody),
++            etap:is(HasDbNameInfo, true, "should return database info");
+         _Else -> etap:is(false, true, <<"ibrowse fail">>)
+     end.
+