Merge branch 'master' of git://factorcode.org/git/factor

[factor.git] / basis / http / http-tests.factor

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
old mode 100755 (executable)
new mode 100644 (file)
index 6da32ef..608ba0c
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -63,7 +63,7 @@ Host: www.sex.com
 
 [
     T{ request
-        { url T{ url host: "www.sex.com" path: "/bar" } }
+        { url T{ url { host "www.sex.com" } { path "/bar" } } }
         { method "HEAD" }
         { version "1.1" }
         { header H{ { "host" "www.sex.com" } } }
@@ -179,10 +179,10 @@ http.server.dispatchers db.tuples ;
 
 : add-quit-action
     <action>
-        [ stop-server "Goodbye" "text/html" <content> ] >>display
+        [ stop-this-server "Goodbye" "text/html" <content> ] >>display
     "quit" add-responder ;
 
-: test-db "test.db" temp-file sqlite-db ;
+: test-db "test.db" temp-file <sqlite-db> ;
 
 [ test-db drop delete-file ] ignore-errors
 
@@ -257,7 +257,7 @@ test-db [
             "" add-responder
             add-quit-action
             <dispatcher>
-                <action> "a" add-main-responder
+                <action> "" add-responder
             "d" add-responder
         test-db <db-persistence>
         main-responder set