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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
| | Remove tests that cannot be run. Some depend on clack, which in turn
depends on lack. Others refer to systems that don't exist
(names starting with "t-").
--- a/lack-component.asd
+++ b/lack-component.asd
@@ -2,7 +2,6 @@
:version "0.2.0"
:author "Eitaro Fukamachi"
:license "MIT"
- :components ((:file "src/component"))
- :in-order-to ((test-op (test-op "t-lack-component"))))
+ :components ((:file "src/component")))
(register-system-packages "lack-component" '(:lack.component))
diff --git a/lack-middleware-accesslog.asd b/lack-middleware-accesslog.asd
index c593988..21a4e70 100644
--- a/lack-middleware-accesslog.asd
+++ b/lack-middleware-accesslog.asd
@@ -6,7 +6,6 @@
"local-time")
:components ((:module "src"
:components
- ((:file "middleware/accesslog"))))
- :in-order-to ((test-op (test-op "t-lack-middleware-accesslog"))))
+ ((:file "middleware/accesslog")))))
(register-system-packages "lack-middleware-accesslog" '(:lack.middleware.accesslog))
diff --git a/lack-middleware-auth-basic.asd b/lack-middleware-auth-basic.asd
index 9206d22..6862f33 100644
--- a/lack-middleware-auth-basic.asd
+++ b/lack-middleware-auth-basic.asd
@@ -6,7 +6,6 @@
"split-sequence")
:components ((:module "src"
:components
- ((:file "middleware/auth/basic"))))
- :in-order-to ((test-op (test-op "t-lack-middleware-auth-basic"))))
+ ((:file "middleware/auth/basic")))))
(register-system-packages "lack-middleware-auth-basic" '(:lack.middleware.auth.basic))
diff --git a/lack-middleware-backtrace.asd b/lack-middleware-backtrace.asd
index 8df7f9f..cf73f81 100644
--- a/lack-middleware-backtrace.asd
+++ b/lack-middleware-backtrace.asd
@@ -3,7 +3,6 @@
:author "Eitaro Fukamachi"
:license "MIT"
:depends-on ("uiop")
- :components ((:file "src/middleware/backtrace"))
- :in-order-to ((test-op (test-op "t-lack-middleware-backtrace"))))
+ :components ((:file "src/middleware/backtrace")))
(register-system-packages "lack-middleware-backtrace" '(:lack.middleware.backtrace))
diff --git a/lack-middleware-csrf.asd b/lack-middleware-csrf.asd
index 105d3bb..fcf46f7 100644
--- a/lack-middleware-csrf.asd
+++ b/lack-middleware-csrf.asd
@@ -6,7 +6,6 @@
"lack-util")
:components ((:module "src"
:components
- ((:file "middleware/csrf"))))
- :in-order-to ((test-op (test-op "t-lack-middleware-csrf"))))
+ ((:file "middleware/csrf")))))
(register-system-packages "lack-middleware-csrf" '(:lack.middleware.csrf))
diff --git a/lack-middleware-session.asd b/lack-middleware-session.asd
index 92b1568..bed4c89 100644
--- a/lack-middleware-session.asd
+++ b/lack-middleware-session.asd
@@ -19,7 +19,6 @@
:pathname "session"
:components
((:file "state")
- (:file "state/cookie"))))))
- :in-order-to ((test-op (test-op "t-lack-middleware-session"))))
+ (:file "state/cookie")))))))
(register-system-packages "lack-middleware-session" '(:lack.middleware.session))
diff --git a/lack-middleware-static.asd b/lack-middleware-static.asd
index a0ce627..107a386 100644
--- a/lack-middleware-static.asd
+++ b/lack-middleware-static.asd
@@ -7,7 +7,6 @@
"alexandria")
:components ((:module "src"
:components
- ((:file "middleware/static"))))
- :in-order-to ((test-op (test-op "t-lack-middleware-static"))))
+ ((:file "middleware/static")))))
(register-system-packages "lack-middleware-static" '(:lack.middleware.static))
diff --git a/lack-request.asd b/lack-request.asd
index 5efa05c..240b421 100644
--- a/lack-request.asd
+++ b/lack-request.asd
@@ -9,7 +9,6 @@
:components ((:module "src"
:components
((:file "request" :depends-on ("media-type"))
- (:file "media-type"))))
- :in-order-to ((test-op (test-op "t-lack-request"))))
+ (:file "media-type")))))
(register-system-packages "lack-request" '(:lack.request))
diff --git a/lack-session-store-dbi.asd b/lack-session-store-dbi.asd
index 00e7d1e..825a96c 100644
--- a/lack-session-store-dbi.asd
+++ b/lack-session-store-dbi.asd
@@ -7,7 +7,6 @@
"marshal"
"trivial-utf-8"
"cl-base64")
- :components ((:file "src/middleware/session/store/dbi"))
- :in-order-to ((test-op (test-op "t-lack-session-store-dbi"))))
+ :components ((:file "src/middleware/session/store/dbi")))
(register-system-packages "lack-session-store-dbi" '(:lack.session.store.dbi))
diff --git a/lack-session-store-redis.asd b/lack-session-store-redis.asd
index 96b0504..57e4046 100644
--- a/lack-session-store-redis.asd
+++ b/lack-session-store-redis.asd
@@ -7,7 +7,6 @@
"marshal"
"cl-base64"
"trivial-utf-8")
- :components ((:file "src/middleware/session/store/redis"))
- :in-order-to ((test-op (test-op "t-lack-session-store-redis"))))
+ :components ((:file "src/middleware/session/store/redis")))
(register-system-packages "lack-session-store-redis" '(:lack.session.store.redis))
diff --git a/lack-util.asd b/lack-util.asd
index 0391a1b..1318c04 100644
--- a/lack-util.asd
+++ b/lack-util.asd
@@ -5,7 +5,6 @@
:depends-on ((:feature (:or :windows :mswindows :win32 :cormanlisp) "ironclad")
(:feature (:not (:or :windows :mswindows :win32 :cormanlisp)) "cl-isaac")
"bordeaux-threads")
- :components ((:file "src/util"))
- :in-order-to ((test-op (test-op "t-lack-util"))))
+ :components ((:file "src/util")))
(register-system-packages "lack-util" '(:lack.util))
diff --git a/lack.asd b/lack.asd
index e213c10..dde71cf 100644
--- a/lack.asd
+++ b/lack.asd
@@ -43,8 +43,6 @@
"lack/middleware/auth/basic"
"lack/session/store/redis"
"lack/session/store/dbi"
- "clack"
- "clack-test"
"hunchentoot"
"dexador"
"cl-cookie"
@@ -60,7 +58,6 @@
:serial t
:components ((:file "builder")
(:file "util")
- (:file "request")
(:file "component")
(:file "media-type")
(:module "middleware"
diff --git a/tests/request.lisp b/tests/request.lisp
deleted file mode 100644
index 3fd26e0..0000000
--- a/tests/request.lisp
+++ /dev/null
@@ -1,71 +0,0 @@
-(defpackage #:lack/tests/request
- (:use #:cl
- #:rove
- #:lack/request
- #:clack.test
- #:flexi-streams)
- (:import-from #:dexador)
- (:import-from #:alexandria
- #:alist-hash-table))
-(in-package #:lack/tests/request)
-
-(defparameter *request*
- (make-request `(:content-type "application/x-www-form-urlencoded; charset=utf-8"
- :content-length 20
- :uri-scheme :http
- :query-string "ediweitz=weitzedi&name=eitaro&q=C%2B%2B"
- :raw-body
- ,(flex:make-flexi-stream
- (flex:make-in-memory-input-stream
- #(110 97 109 101 61 230 183 177 231 148 186 232 139 177 229 164 170 233 131 142))
- :external-format :utf-8)
- :headers ,(alexandria:alist-hash-table
- '(("referer" . "http://github.com/fukamachi/clack")
- ("user-agent" . "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-US)")
- ("accept" . "text/html")
- ("cookie" . "hoge=1;fuga=semi;colon"))
- :test 'equal))))
-
-(deftest lack-request
- (ok (typep *request* 'request))
-
- (ok (request-env *request*) "request-env")
-
- (ok (equal (request-content-type *request*) "application/x-www-form-urlencoded; charset=utf-8")
- "request-content-type")
-
- (ok (equalp (request-query-parameters *request*)
- '(("ediweitz" . "weitzedi") ("name" . "eitaro") ("q" . "C++")))
- "request-query-parameters")
-
- (ok (equalp (request-body-parameters *request*)
- `(("name" . ,(flex:octets-to-string
- #(230 183 177 231 148 186 232 139 177 229 164 170 233 131 142)
- :external-format :utf-8))))
- "request-body-parameters")
-
- (ok (equalp (request-cookies *request*)
- '(("hoge" . "1") ("fuga" . "semi") ("colon")))
- "request-cookies")
-
- (ok (request-accepts-p *request* "text/html"))
-
- (ng (request-accepts-p *request* "application/json"))
-
- (testing-app "make-request"
- (lambda (env)
- (make-request env)
- `(200 nil (,(third (assoc "file" (request-body-parameters (make-request env)) :test #'string=)))))
- (multiple-value-bind (body status)
- (dex:post (localhost)
- :content
- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg"))))
- (ok (eql status 200))
- (ok (equal body "jellyfish.jpg")))
-
- (multiple-value-bind (body status)
- (dex:post (localhost)
- :content
- `(("file" . ,(asdf:system-relative-pathname :lack #P"data/jellyfish.jpg"))))
- (ok (eql status 200))
- (ok (equal body "jellyfish.jpg")))))
|