@@ -252,6 +252,14 @@ mod test {
252
252
assert_eq ! ( Ok ( false ) , processed) ;
253
253
}
254
254
255
+ fn version_find_first ( conn : & PgConnection , id : i32 ) -> Version {
256
+ versions:: table
257
+ . find ( id)
258
+ . select ( cargo_registry:: models:: version:: ALL_COLUMNS )
259
+ . first :: < Version > ( conn)
260
+ . unwrap ( )
261
+ }
262
+
255
263
#[ test]
256
264
fn increment_a_little ( ) {
257
265
use diesel:: dsl:: * ;
@@ -286,21 +294,13 @@ mod test {
286
294
. execute ( & conn)
287
295
. unwrap ( ) ;
288
296
289
- let version_before = versions:: table
290
- . find ( version. id )
291
- . select ( cargo_registry:: models:: version:: ALL_COLUMNS )
292
- . first :: < Version > ( & conn)
293
- . unwrap ( ) ;
297
+ let version_before = version_find_first ( & conn, version. id ) ;
294
298
let krate_before = Crate :: all ( )
295
299
. filter ( crates:: id. eq ( krate. id ) )
296
300
. first :: < Crate > ( & conn)
297
301
. unwrap ( ) ;
298
302
crate :: update ( & conn) . unwrap ( ) ;
299
- let version2 = versions:: table
300
- . find ( version. id )
301
- . select ( cargo_registry:: models:: version:: ALL_COLUMNS )
302
- . first :: < Version > ( & conn)
303
- . unwrap ( ) ;
303
+ let version2 = version_find_first ( & conn, version. id ) ;
304
304
assert_eq ! ( version2. downloads, 2 ) ;
305
305
assert_eq ! ( version2. updated_at, version_before. updated_at) ;
306
306
let krate2 = Crate :: all ( )
@@ -311,11 +311,7 @@ mod test {
311
311
assert_eq ! ( krate2. updated_at, krate_before. updated_at) ;
312
312
crate_downloads ! ( & conn, krate. id, 1 ) ;
313
313
crate :: update ( & conn) . unwrap ( ) ;
314
- let version3 = versions:: table
315
- . find ( version. id )
316
- . select ( cargo_registry:: models:: version:: ALL_COLUMNS )
317
- . first :: < Version > ( & conn)
318
- . unwrap ( ) ;
314
+ let version3 = version_find_first ( & conn, version. id ) ;
319
315
assert_eq ! ( version3. downloads, 2 ) ;
320
316
}
321
317
0 commit comments