File tree 2 files changed +30
-17
lines changed
src/Http/Controllers/Views
tests/Http/Controllers/Views
2 files changed +30
-17
lines changed Original file line number Diff line number Diff line change @@ -76,15 +76,19 @@ public function create(Request $request)
76
76
*
77
77
* @return \Illuminate\Http\Response
78
78
*/
79
- public function review ($ id )
80
- {
81
- $ request = StorageRequest::whereNull ('expires_at ' )
82
- ->with ('files ' )
83
- ->findOrFail ($ id );
84
- $ this ->authorize ('approve ' , $ request );
85
79
86
- return view ('user-storage::review ' , [
87
- 'request ' => $ request ,
88
- ]);
89
- }
80
+ public function review ($ id )
81
+ {
82
+ $ request = StorageRequest::whereNull ('expires_at ' )
83
+ ->whereNotNull ('submitted_at ' ) // Add this condition
84
+ ->with ('files ' )
85
+ ->findOrFail ($ id );
86
+
87
+ $ this ->authorize ('approve ' , $ request );
88
+
89
+ return view ('user-storage::review ' , [
90
+ 'request ' => $ request ,
91
+ ]);
92
+ }
93
+
90
94
}
Original file line number Diff line number Diff line change @@ -55,31 +55,40 @@ public function testReview()
55
55
{
56
56
$ request = StorageRequest::factory ()->create ();
57
57
$ id = $ request ->id ;
58
-
58
+
59
59
$ this ->get ("storage-requests/ {$ id }/review " )->assertRedirect ('login ' );
60
-
60
+
61
61
$ this ->actingAs ($ request ->user )
62
62
->get ("storage-requests/ {$ id }/review " )
63
63
->assertStatus (403 );
64
-
64
+
65
65
$ user = UserTest::create ([
66
66
'role_id ' => Role::editorId (),
67
67
]);
68
-
68
+
69
69
$ this ->actingAs ($ user )
70
70
->get ("storage-requests/ {$ id }/review " )
71
71
->assertStatus (403 );
72
-
72
+
73
73
$ user ->role_id = Role::adminId ();
74
74
$ user ->save ();
75
-
75
+
76
76
$ this ->actingAs ($ user )
77
77
->get ("storage-requests/ {$ id }/review " )
78
78
->assertViewIs ('user-storage::review ' );
79
-
79
+
80
80
$ request ->update (['expires_at ' => '2022-03-28 10:40:00 ' ]);
81
81
$ this ->actingAs ($ user )
82
82
->get ("storage-requests/ {$ id }/review " )
83
83
->assertStatus (404 );
84
+
85
+ $ unsubmittedRequest = StorageRequest::factory ()->create ([
86
+ 'submitted_at ' => null ,
87
+ ]);
88
+
89
+ $ this ->actingAs ($ user )
90
+ ->get ("storage-requests/ {$ unsubmittedRequest ->id }/review " )
91
+ ->assertStatus (404 );
84
92
}
93
+
85
94
}
You can’t perform that action at this time.
0 commit comments